From a98b2ed2ddcf15db5b20907cd502e157d04d1b88 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 10:22:06 +0800
Subject: [PATCH] 去掉无用配置
---
controllers/location_product_amount.go | 112 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 1df4755..8d44349 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,
@@ -50,14 +51,13 @@
material.unit,
wms_location_product_amount.create_date,
wms_operation_details.amount as adjust_amount,
- wms_operation.id as operation_id`).
+ wms_operation.id as operation_id,
+ wms_operation.status`).
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
@@ -71,12 +71,14 @@
if params.Page*params.PageSize > 0 {
search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
}
- if err := search.Orm.Find(&records).Error; err != nil {
+ if err := search.Orm.Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
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)
}
@@ -122,6 +124,11 @@
util.ResponseFormat(c, code.RequestError, "涓嶅瓨鍦ㄨ涓婃灦瑙勫垯锛屾棤娉曡繘琛屽簱瀛樼洏鐐�")
return
}
+ existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -129,11 +136,15 @@
}
//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"),
+ var locAmount models.LocationProductAmount
+ if existAmount.Id == 0 {
+ 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,
Amount: reqParams.AdjustAmount,
@@ -149,20 +160,14 @@
ToLocationID: reqParams.LocationId,
}
- //if reqParams.AdjustAmount.GreaterThanOrEqual(decimal.NewFromInt(0)) {
- // operation.FromLocationID = Location.Id
- // operation.ToLocationID = reqParams.LocationId
- //} else {
- // operation.FromLocationID = reqParams.LocationId
- // operation.ToLocationID = Location.Id
- //}
-
if err := models.WithTransaction(func(tx *gorm.DB) error {
if err := models.NewOperationSearch().SetOrm(tx).Create(&operation); err != nil {
return err
}
- if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil {
- return err
+ if existAmount.Id == 0 {
+ if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil {
+ return err
+ }
}
return nil
}); err != nil {
@@ -199,7 +204,7 @@
util.ResponseFormat(c, code.Success, ruleList)
}
-// Add
+// Update
// @Tags 搴撳瓨鐩樼偣
// @Summary 淇敼搴撳瓨鐩樼偣淇℃伅
// @Produce application/json
@@ -230,3 +235,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