From ec58bf196fb360bfcec35ed784ae9da90ffa3d42 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 12 十二月 2023 11:06:50 +0800
Subject: [PATCH] 调整listbycondition接口服务

---
 controllers/product_controller.go |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 053effc..43a9db0 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -15,7 +15,6 @@
 	"wms/models"
 	"wms/pkg/logx"
 	"wms/request"
-	"wms/utils"
 )
 
 type ProductController struct {
@@ -34,6 +33,10 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
 		return
 	}
+	if params.ID == "" {
+		util.ResponseFormat(c, code.RequestParamError, "浜у搧缂栫爜涓嶈兘涓虹┖")
+		return
+	}
 	if params.Name == "" {
 		util.ResponseFormat(c, code.RequestParamError, "浜у搧鍚嶇О涓嶈兘涓虹┖")
 		return
@@ -46,7 +49,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍗曚綅涓嶈兘涓虹┖")
 		return
 	}
-	params.ID = utils.GetUUID()
+	//params.ID = utils.GetUUID()
 	err := models.NewMaterialSearch().Create(&params)
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅淇濆瓨澶辫触")
@@ -211,6 +214,22 @@
 		return
 	}
 
+	//鏇存柊鍦ㄥ簱鐨勪骇鍝佺被鍨�
+	if params.CategoryId > 0 {
+		find, _ := models.NewLocationProductAmountSearch().SetProductId(params.ID).Find()
+		if len(find) > 0 {
+			var ids []int
+			for _, f := range find {
+				if f.ProductCategoryID != params.CategoryId {
+					ids = append(ids, f.Id)
+				}
+			}
+			m := make(map[string]interface{})
+			m["productCategoryId"] = params.CategoryId
+			_ = models.NewLocationProductAmountSearch().SetIds(ids).UpdateByMap(m)
+		}
+	}
+
 	materialAttachmentList := []*models.MaterialAttachment{}
 	for _, v := range params.AttachmentIDs {
 		ma := &models.MaterialAttachment{MaterialID: params.ID, AttachmentID: v}
@@ -315,7 +334,7 @@
 		return
 	}
 
-	first, err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).First()
+	first, err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).First()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return
@@ -340,7 +359,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷鍚嶇О涓嶈兘涓虹┖")
 		return
 	}
-	err := models.NewProductCategorySearch().SetID(params.ID).Save(&params)
+	err := models.NewProductCategorySearch().SetID(params.Id).Save(&params)
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷淇℃伅鏇存柊澶辫触")
 		return
@@ -361,7 +380,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
 		return
 	}
-	err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).Delete()
+	err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).Delete()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
 		return
@@ -525,7 +544,7 @@
 		return
 	}
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
-		if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
+		if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
 			return err
 		}
 		var listProdtId []string
@@ -572,7 +591,7 @@
 
 				locAmount, res := models.NewLocationProductAmountSearch().
 					SetProductId(v.ID).
-					SetLocationId(operation.ToLocationID).
+					SetLocationId(operation.FromLocationID).
 					FirstRes()
 				if res.Error != nil {
 					return err
@@ -689,7 +708,7 @@
 	search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
 	search.SetOrm(search.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.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
 
-	list, total, err := search.Find()
+	list, total, err := search.SetBaseOperationType(constvar.BaseOperationTypeAdjust).Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
 		return
@@ -726,6 +745,7 @@
 		return
 	}
 	operation.Status = constvar.OperationStatus_Cancel
+	operation.AuditDate = time.Now().Format("2006-01-02 15:04:05")
 	if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil {
 		util.ResponseFormat(c, code.SaveFail, err.Error())
 		return

--
Gitblit v1.8.0