From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口
---
controllers/location_product_amount.go | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 82e15ac..87ff91b 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -11,6 +11,7 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
"wms/pkg/mysqlx"
"wms/request"
@@ -57,7 +58,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,14 +106,40 @@
}
} 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)
}
@@ -129,8 +156,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 +165,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淇℃伅涓嶅瓨鍦�")
}
@@ -166,7 +193,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{
@@ -181,7 +207,7 @@
detail := &models.OperationDetails{
ProductId: reqParams.ProductId,
- Amount: reqParams.AdjustAmount,
+ Amount: reqParams.DifferenceAmount,
FromLocationID: location.Id,
ToLocationID: reqParams.LocationId,
}
@@ -194,6 +220,7 @@
Details: []*models.OperationDetails{detail},
LocationID: location.Id,
OperationTypeName: "搴撳瓨璋冩暣",
+ CreatedBy: userInfo.Username,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -253,26 +280,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 +330,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 +346,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