From b784b08a26808e9faccb7ea397de946501a939eb Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 27 九月 2023 20:08:43 +0800
Subject: [PATCH] 1.二期一部分代码
---
controllers/location_product_amount.go | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 5e0b383..d7594dc 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -48,7 +48,8 @@
wms_location_product_amount.amount,
material.unit,
wms_location_product_amount.create_date,
- wms_operation_details.amount as adjust_amount`).
+ 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 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").
@@ -125,11 +126,12 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
- //reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
+ //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
+ reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
locAmount := models.LocationProductAmount{
LocationProductId: locProduct.Id,
Amount: decimal.NewFromInt(0),
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
}
detail := &models.OperationDetails{
ProductId: reqParams.ProductId,
@@ -142,8 +144,8 @@
Comment: "搴撳瓨鐩樼偣",
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
- FromLocationID: reqParams.LocationId,
- ToLocationID: location.Id,
+ FromLocationID: location.Id,
+ ToLocationID: reqParams.LocationId,
}
//if reqParams.AdjustAmount.GreaterThanOrEqual(decimal.NewFromInt(0)) {
@@ -169,3 +171,35 @@
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
}
+
+// Add
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 淇敼搴撳瓨鐩樼偣淇℃伅
+// @Produce application/json
+// @Param object body request.UpdateLocationProductAmount true "鍏ュ簱/鍑哄簱淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/update [post]
+func (slf LocationProductAmountController) Update(c *gin.Context) {
+ var reqParams request.UpdateLocationProductAmount
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
+ operation, err := models.NewOperationSearch().SetID(reqParams.OperationId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏虫暟鎹�")
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曞凡楠岃瘉閫氳繃锛屾棤娉曡繘琛屼慨鏀�")
+ return
+ }
+
+ if err := models.NewOperationDetailsSearch().SetOperationId(reqParams.OperationId).SetProductId(reqParams.ProductId).Update(&models.OperationDetails{Amount: reqParams.AdjustAmount}); err != nil {
+ util.ResponseFormat(c, code.RequestError, "淇敼澶辫触锛�"+err.Error())
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
+}
--
Gitblit v1.8.0