From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
controllers/location_product_amount.go | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 195d636..ec9165c 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -25,11 +25,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
@@ -38,6 +38,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)
@@ -45,7 +57,9 @@
//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`).
+ 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")
@@ -53,6 +67,13 @@
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,9 +87,14 @@
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
return
}
- var operation models.Operation
+
for k, v := range records {
- if res := mysqlx.GetDB().Table("wms_operation").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 {
+ 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
@@ -79,8 +105,8 @@
}
} 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
@@ -106,6 +132,7 @@
if err := AddLocationProductAmount(reqParams); err != nil {
util.ResponseFormat(c, code.RequestError, err)
+ return
}
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
@@ -123,7 +150,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
}
@@ -139,7 +166,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{
@@ -154,7 +180,7 @@
detail := &models.OperationDetails{
ProductId: reqParams.ProductId,
- Amount: reqParams.AdjustAmount,
+ Amount: reqParams.DifferenceAmount,
FromLocationID: location.Id,
ToLocationID: reqParams.LocationId,
}
@@ -165,6 +191,8 @@
Comment: "搴撳瓨鐩樼偣",
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
+ LocationID: location.Id,
+ OperationTypeName: "搴撳瓨璋冩暣",
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -232,18 +260,17 @@
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
}
@@ -251,7 +278,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// finish
+// Finish
//
// @Tags 搴撳瓨鐩樼偣
// @Summary 搴旂敤銆侀獙璇�
@@ -274,7 +301,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())
@@ -289,19 +317,20 @@
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)
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 {
+ 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
@@ -311,3 +340,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