From 0551df1d2a65876b2427df112e37625f128b67e4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 23 十月 2023 11:59:34 +0800
Subject: [PATCH] 1.库存盘点列表增加基础作业类型
---
controllers/location_product_amount.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index ce3bcf4..f895a6c 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -71,17 +71,21 @@
if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
if errors.Is(res.Error, gorm.ErrRecordNotFound) {
records[k].Status = constvar.OperationStatus_Finish
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
continue
} else {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
return
}
} else {
- records[k].AdjustAmount = operation.Details[0].Amount
+ if len(operation.Details) > 0 {
+ records[k].AdjustAmount = operation.Details[0].Amount
+ records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
records[k].OperationId = operation.Id
records[k].Status = operation.Status
- records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
}
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
--
Gitblit v1.8.0