From 84efc2b9cc81fadfffe35c6e3a07dd735ef46a98 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 九月 2023 11:25:11 +0800
Subject: [PATCH] 1.修改库存盘点列表bug
---
controllers/location_product_amount.go | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 1df4755..053979e 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -42,6 +42,7 @@
search.Orm = search.Orm.
Table("wms_location_product_amount").
Select(`
+ wms_location_product_amount.id as location_product_amount_id,
wms_location.id as location_id,
wms_location.name as location_name,
material.id as product_id,
@@ -52,12 +53,10 @@
wms_operation_details.amount as adjust_amount,
wms_operation.id as operation_id`).
InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+ InnerJoins("inner join material on material.id=wms_location_product.product_id").
InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id").
- InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
- InnerJoins("inner join material on material.id=wms_operation_details.product_id").
- InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").
- Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)
-
+ Joins("left join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
+ Joins("left join wms_operation on wms_operation.id=wms_operation_details.operation_id and wms_operation.base_operation_type=? and wms_operation.status=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready)
var (
records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
@@ -76,7 +75,9 @@
return
}
for k, v := range records {
- records[k].DifferenceAmount = v.Amount.Sub(v.AdjustAmount)
+ if v.OperationId != 0 {
+ records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
@@ -230,3 +231,64 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
+
+// finish
+//
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 搴旂敤銆侀獙璇�
+// @Produce application/json
+// @Param object body request.FinishLocationProductAmount true "鍏ュ弬"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/finish [post]
+func (slf LocationProductAmountController) Finish(c *gin.Context) {
+ var reqParams request.FinishLocationProductAmount
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if reqParams.LocationProductAmountId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "locationProductAmountId涓�0")
+ return
+ }
+ if reqParams.OperationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "operationId涓�0")
+ return
+ }
+ operationSearch := models.NewOperationSearch().SetPreload(true)
+ operationSearch.SetOrm(operationSearch.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and wms_operation.id=?", reqParams.ProductId, reqParams.OperationId))
+ operation, err := operationSearch.First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏充俊鎭�:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestError, "璇ラ獙璇佹棤娉曞畬鎴�")
+ return
+ }
+ material, err := models.NewMaterialSearch().SetID(reqParams.ProductId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ locProdtAmount, err := models.NewLocationProductAmountSearch().SetID(reqParams.LocationProductAmountId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ if err := models.WithTransaction(func(tx *gorm.DB) error {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(reqParams.OperationId).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
+ return err
+ }
+ if err := models.NewMaterialSearch().SetOrm(tx).SetID(reqParams.ProductId).Update(&models.Material{Amount: material.Amount.Add(operation.Details[0].Amount)}); err != nil {
+ return err
+ }
+ if err := models.NewLocationProductAmountSearch().SetOrm(tx).SetID(reqParams.LocationProductAmountId).Update(&models.LocationProductAmount{Amount: locProdtAmount.Amount.Add(operation.Details[0].Amount)}); err != nil {
+ return err
+ }
+ return nil
+ }); err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
+}
--
Gitblit v1.8.0