From b68f799ee5562864642cf925ab58391cd5544825 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 06 七月 2024 17:41:59 +0800
Subject: [PATCH] 出入库明细筛选添加仓库关联，防止脏数据污染
---
controllers/location_product_amount.go | 129 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 18 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 97a6f8e..abd668c 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -4,6 +4,7 @@
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/mitchellh/mapstructure"
"github.com/shopspring/decimal"
"gorm.io/gorm"
"strconv"
@@ -11,6 +12,7 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
"wms/pkg/mysqlx"
"wms/request"
@@ -57,7 +59,7 @@
//wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status
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,
+ Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.joint_name as location_name,
material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,
wms_location_product_amount.create_date,material.weight`).
InnerJoins("inner join material on material.id=wms_location_product_amount.product_id").
@@ -105,15 +107,100 @@
}
} else {
if len(operation.Details) > 0 {
- records[k].AdjustAmount = operation.Details[0].Amount
- records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ records[k].DifferenceAmount = operation.Details[0].Amount
+ records[k].AdjustAmount = v.DifferenceAmount.Sub(v.Amount)
}
records[k].OperationId = operation.Id
records[k].Status = operation.Status
}
records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
}
+
+ productIds = make([]string, 0)
+ for _, record := range records {
+ productIds = append(productIds, record.ProductId)
+ }
+
+ products, err := models.NewMaterialSearch().SetIDs(productIds).FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ヨ浜у搧澶辫触")
+ return
+ }
+
+ productMap := models.MaterialMap(products)
+
+ for k, v := range records {
+ product := productMap[v.ProductId]
+ if product == nil {
+ continue
+ }
+
+ moreUnit := product.MoreUnit
+ if moreUnit != nil && *moreUnit {
+ records[k].AmountMoreUnits = service.CreateMoreUnit(v.Amount, product.MoreUnitList)
+ }
+ }
+
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}
+
+// LocationProductList
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃
+// @Produce application/json
+// @Param object body request.GetLocationProductList true "鏌ヨ鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.ResponseList(data=[]*response.LocationProductAmount) "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/locationProductList [post]
+func (slf LocationProductAmountController) LocationProductList(c *gin.Context) {
+ var params request.GetLocationProductList
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父")
+ return
+ }
+ productIds := make([]string, 0)
+ locationIds := make([]int, 0)
+ if params.Keyword != "" {
+ materials, _ := models.NewMaterialSearch().SetKeyword(params.Keyword).FindNotTotal()
+ for _, material := range materials {
+ productIds = append(productIds, material.ID)
+ }
+ locations, _ := models.NewLocationSearch().SetKeyword(params.Keyword).FindNotTotal()
+ for _, location := range locations {
+ locationIds = append(locationIds, location.Id)
+ }
+ }
+
+ search := models.NewLocationProductAmountSearch()
+ records, total, err := search.
+ SetLocationIds(locationIds).SetWarehouseId(params.WarehouseId).SetProductIds(productIds).SetLocationId(params.LocationId).
+ SetPage(params.Page, params.PageSize).
+ SetOrder("id desc").
+ SetPreload(true).
+ FindByPage()
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+
+ dataList := make([]*response.LocationProductAmount, 0, len(records))
+
+ for _, v := range records {
+ data := new(response.LocationProductAmount)
+ mapstructure.Decode(v.Product, &data)
+ data.ID = v.ProductId
+ data.LocationId = v.LocationId
+ data.Location = v.Location
+ data.Amount = v.Amount
+ data.ProductId = v.ProductId
+ dataList = append(dataList, data)
+ }
+
+ util.ResponseFormatList(c, code.Success, dataList, int(total))
}
// Add
@@ -129,8 +216,8 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
-
- if err := AddLocationProductAmount(reqParams); err != nil {
+ userInfo := middleware.GetUserInfo(c)
+ if err := AddLocationProductAmount(reqParams, userInfo); err != nil {
util.ResponseFormat(c, code.RequestError, err)
return
}
@@ -138,7 +225,7 @@
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
}
-func AddLocationProductAmount(reqParams request.UpdateLocationProductAmount) error {
+func AddLocationProductAmount(reqParams request.UpdateLocationProductAmount, userInfo *request.CustomClaims) error {
if reqParams.LocationId == 0 {
return errors.New("鍙傛暟寮傚父锛屼綅缃甶d淇℃伅涓嶅瓨鍦�")
}
@@ -150,7 +237,7 @@
if err := models.NewOperationSearch().Orm.
Table("wms_operation").
InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
- Where("wms_operation.location_id=? and wms_operation_details.product_id=? and wms_operation.base_operation_type=? and wms_operation.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).
+ Where("wms_operation_details.to_location_id=? and wms_operation_details.product_id=? and wms_operation.base_operation_type=? and wms_operation.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).
Count(&existCount).Error; err != nil {
return err
}
@@ -166,7 +253,6 @@
if err != nil {
return err
}
- reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
var locAmount models.LocationProductAmount
if res.Error != nil && errors.Is(res.Error, gorm.ErrRecordNotFound) {
locAmount = models.LocationProductAmount{
@@ -176,12 +262,13 @@
ProductId: reqParams.ProductId,
Amount: decimal.NewFromInt(0),
CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ WarehouseId: location.WarehouseId,
}
}
detail := &models.OperationDetails{
ProductId: reqParams.ProductId,
- Amount: reqParams.AdjustAmount,
+ Amount: reqParams.DifferenceAmount,
FromLocationID: location.Id,
ToLocationID: reqParams.LocationId,
}
@@ -194,6 +281,7 @@
Details: []*models.OperationDetails{detail},
LocationID: location.Id,
OperationTypeName: "搴撳瓨璋冩暣",
+ CreatedBy: userInfo.Username,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -253,26 +341,26 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
+ userInfo := middleware.GetUserInfo(c)
if reqParams.OperationId == 0 {
- if err := AddLocationProductAmount(reqParams); err != nil {
+ if err := AddLocationProductAmount(reqParams, userInfo); err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
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, "璇ヨ褰曞凡楠岃瘉閫氳繃锛屾棤娉曡繘琛屼慨鏀�")
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曞凡琚獙璇�,璇峰埛鏂伴〉闈㈡煡鐪�")
return
}
- if err := models.NewOperationDetailsSearch().SetOperationId(reqParams.OperationId).SetProductId(reqParams.ProductId).Update(&models.OperationDetails{Amount: reqParams.AdjustAmount}); err != nil {
+ if err := models.NewOperationDetailsSearch().SetOperationId(reqParams.OperationId).SetProductId(reqParams.ProductId).Update(&models.OperationDetails{Amount: reqParams.DifferenceAmount}); err != nil {
util.ResponseFormat(c, code.RequestError, "淇敼澶辫触锛�"+err.Error())
return
}
@@ -303,7 +391,8 @@
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))
+ 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())
@@ -318,19 +407,23 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
- locProdtAmount, err := models.NewLocationProductAmountSearch().SetID(reqParams.LocationProductAmountId).First()
+ locProductAmount, err := models.NewLocationProductAmountSearch().SetID(reqParams.LocationProductAmountId).First()
if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
+ adjustAmount := operation.Details[0].Amount.Sub(locProductAmount.Amount)
+ userInfo := middleware.GetUserInfo(c)
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 {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(reqParams.OperationId).Update(&models.Operation{
+ Status: constvar.OperationStatus_Finish, CheckedBy: userInfo.Username,
+ AuditDate: time.Now().Format("2006-01-02 15:04:05")}); 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 {
+ if err := models.NewMaterialSearch().SetOrm(tx).SetID(reqParams.ProductId).Update(&models.Material{Amount: material.Amount.Add(adjustAmount)}); 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 {
+ if err := models.NewLocationProductAmountSearch().SetOrm(tx).SetID(reqParams.LocationProductAmountId).Update(&models.LocationProductAmount{Amount: operation.Details[0].Amount}); err != nil {
return err
}
return nil
--
Gitblit v1.8.0