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 | 182 +++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 42 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index ce3bcf4..87ff91b 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -11,9 +11,12 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
+ "wms/pkg/mysqlx"
"wms/request"
"wms/response"
+ "wms/service"
)
type LocationProductAmountController struct {
@@ -23,11 +26,11 @@
// @Tags 搴撳瓨鐩樼偣
// @Summary 搴撳瓨鐩樼偣鍒楄〃
// @Produce application/json
-// @Param object body request.PageInfo true "鏌ヨ鍙傛暟"
+// @Param object body request.GetList true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
// @Router /api-wms/v1/locationProductAmount/list [post]
func (slf LocationProductAmountController) List(c *gin.Context) {
- var params request.PageInfo
+ var params request.GetList
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
return
@@ -36,6 +39,18 @@
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()
//search.SetPage(params.Page, params.PageSize)
@@ -43,16 +58,23 @@
//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,material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`).
- 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")
- //Joins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
- //Joins("inner 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)
+ 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").
+ InnerJoins("inner join wms_location on wms_location.id=wms_location_product_amount.location_id")
+
var (
records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
)
+ if len(productIds) > 0 {
+ search.Orm = search.Orm.Where("wms_location_product_amount.product_id in (?)", productIds)
+
+ }
+ if len(locationIds) > 0 {
+ search.Orm = search.Orm.Where("wms_location_product_amount.location_id in (?)", locationIds)
+ }
if err := search.Orm.Count(&total).Error; err != nil {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
@@ -66,23 +88,58 @@
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
return
}
- var operation models.Operation
+
for k, v := range records {
- if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
+ var operation models.Operation
+ db := mysqlx.GetDB()
+ if res := db.Table("wms_operation").Preload("Details").InnerJoins("inner join wms_operation_details "+
+ "on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.base_operation_type=? and "+
+ "wms_operation.status=? and wms_operation_details.to_location_id=? and wms_operation_details.product_id=?", constvar.BaseOperationTypeAdjust,
+ constvar.OperationStatus_Ready, v.LocationId, v.ProductId).First(&operation); res.Error != nil {
if errors.Is(res.Error, gorm.ErrRecordNotFound) {
records[k].Status = constvar.OperationStatus_Finish
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
continue
} else {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
return
}
} else {
- records[k].AdjustAmount = operation.Details[0].Amount
+ if len(operation.Details) > 0 {
+ 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].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
+ 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)
}
@@ -99,15 +156,16 @@
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
}
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淇℃伅涓嶅瓨鍦�")
}
@@ -116,40 +174,42 @@
}
var existCount int64
- 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.from_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 {
+ 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_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
}
if existCount > 0 {
return errors.New("璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅")
}
- locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
- if err != nil {
- return errors.New("鍙傛暟寮傚父锛屾湭鎵惧埌璇ヤ笂鏋惰鍒�")
- }
-
- existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
- if err != nil {
- return err
+ existAmount, res := models.NewLocationProductAmountSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).FirstRes()
+ if res.Error != nil && !errors.Is(res.Error, gorm.ErrRecordNotFound) {
+ return res.Error
}
location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
if err != nil {
return err
}
- //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
- reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
var locAmount models.LocationProductAmount
- if existAmount.Id == 0 {
+ if res.Error != nil && errors.Is(res.Error, gorm.ErrRecordNotFound) {
locAmount = models.LocationProductAmount{
- LocationProductId: locProduct.Id,
+ LocationId: reqParams.LocationId,
+ //TODO:姝ゅ鏂板浜哖roductCategoryId鍏ュ弬锛岀洰鍓嶄笉娓呮杩欎釜鍊肩殑鏉ユ簮
+ ProductCategoryID: reqParams.ProductCategoryId,
+ ProductId: reqParams.ProductId,
Amount: decimal.NewFromInt(0),
CreateDate: time.Now().Format("2006-01-02 15:04:05"),
}
}
detail := &models.OperationDetails{
- ProductId: reqParams.ProductId,
- Amount: reqParams.AdjustAmount,
+ ProductId: reqParams.ProductId,
+ Amount: reqParams.DifferenceAmount,
+ FromLocationID: location.Id,
+ ToLocationID: reqParams.LocationId,
}
operation := models.Operation{
Number: strconv.FormatInt(time.Now().Unix(), 10),
@@ -158,8 +218,9 @@
Comment: "搴撳瓨鐩樼偣",
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
- FromLocationID: location.Id,
- ToLocationID: reqParams.LocationId,
+ LocationID: location.Id,
+ OperationTypeName: "搴撳瓨璋冩暣",
+ CreatedBy: userInfo.Username,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -175,6 +236,8 @@
}); err != nil {
return err
}
+
+ service.AddNewLocationReportRecord(locAmount.Id)
return nil
}
@@ -217,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
}
@@ -244,7 +307,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// finish
+// Finish
//
// @Tags 搴撳瓨鐩樼偣
// @Summary 搴旂敤銆侀獙璇�
@@ -267,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())
@@ -282,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
@@ -304,3 +372,33 @@
}
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
+
+// GetLocationProductAmount
+//
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 鑾峰彇浣嶇疆浜у搧淇℃伅
+// @Produce application/json
+// @Param object body request.GetRuleList true "鍏ュ弬"
+// @Success 200 {object} util.Response{data=models.LocationProductAmount} "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/getLocationProductAmount [post]
+func (slf LocationProductAmountController) GetLocationProductAmount(c *gin.Context) {
+ var params request.GetRuleList
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if params.LocationId == 0 || params.ProductId == "" {
+ util.ResponseFormat(c, code.Success, nil)
+ return
+ }
+ first, err := models.NewLocationProductAmountSearch().SetLocationId(params.LocationId).SetProductId(params.ProductId).First()
+ if err != nil {
+ if err == gorm.ErrRecordNotFound {
+ util.ResponseFormat(c, code.Success, nil)
+ return
+ }
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, first)
+}
--
Gitblit v1.8.0