From 439b8cf9619e6deb6b42182d0f43cc1252fc9d2a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 15 四月 2024 11:09:41 +0800
Subject: [PATCH] 获取aps人员列表

---
 controllers/location_product_amount.go |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index bcf0abb..90d59f1 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 {
@@ -66,7 +68,7 @@
 	}
 	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 +120,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 +153,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 +165,6 @@
 		Comment:           "搴撳瓨鐩樼偣",
 		BaseOperationType: constvar.BaseOperationTypeAdjust,
 		Details:           []*models.OperationDetails{detail},
-		FromLocationID:    location.Id,
-		ToLocationID:      reqParams.LocationId,
 	}
 
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -174,6 +180,8 @@
 	}); err != nil {
 		return err
 	}
+
+	service.AddNewLocationReportRecord(locAmount.Id)
 	return nil
 }
 
@@ -243,7 +251,7 @@
 	util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
 }
 
-// finish
+// Finish
 //
 //	@Tags		搴撳瓨鐩樼偣
 //	@Summary	搴旂敤銆侀獙璇�
@@ -303,3 +311,29 @@
 	}
 	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(&params); 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 {
+		util.ResponseFormat(c, code.RequestParamError, err.Error())
+		return
+	}
+	util.ResponseFormat(c, code.Success, first)
+}

--
Gitblit v1.8.0