From 67b13bb40517145cfadc05d7b22411b16f1528d7 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/location_product_amount.go | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 3f33ff3..4b65a15 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -12,8 +12,10 @@
"wms/extend/code"
"wms/extend/util"
"wms/models"
+ "wms/pkg/mysqlx"
"wms/request"
"wms/response"
+ "wms/service"
)
type LocationProductAmountController struct {
@@ -43,7 +45,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.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")
@@ -60,13 +64,13 @@
if params.Page*params.PageSize > 0 {
search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
}
- if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil {
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 {
+ 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 {
if errors.Is(res.Error, gorm.ErrRecordNotFound) {
records[k].Status = constvar.OperationStatus_Finish
records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
@@ -118,7 +122,11 @@
}
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.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 {
@@ -147,8 +155,10 @@
}
detail := &models.OperationDetails{
- ProductId: reqParams.ProductId,
- Amount: reqParams.AdjustAmount,
+ ProductId: reqParams.ProductId,
+ Amount: reqParams.AdjustAmount,
+ FromLocationID: location.Id,
+ ToLocationID: reqParams.LocationId,
}
operation := models.Operation{
Number: strconv.FormatInt(time.Now().Unix(), 10),
@@ -157,8 +167,7 @@
Comment: "搴撳瓨鐩樼偣",
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
- FromLocationID: location.Id,
- ToLocationID: reqParams.LocationId,
+ LocationID: location.Id,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -174,6 +183,8 @@
}); err != nil {
return err
}
+
+ service.AddNewLocationReportRecord(locAmount.Id)
return nil
}
@@ -243,7 +254,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// finish
+// Finish
//
// @Tags 搴撳瓨鐩樼偣
// @Summary 搴旂敤銆侀獙璇�
@@ -303,3 +314,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