From 201be38fd71ee487d887e686cf07773ec750a8de Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 26 十月 2023 17:56:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 controllers/location_product.go |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/controllers/location_product.go b/controllers/location_product.go
index 07d012b..854d451 100644
--- a/controllers/location_product.go
+++ b/controllers/location_product.go
@@ -44,10 +44,11 @@
 		util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧")
 		return
 	}
-	if params.ProductCategoryID == 0 {
-		util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆")
-		return
-	}
+	//if params.ProductCategoryID == 0 {
+	//	util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆")
+	//	return
+	//}
+
 	if err := models.NewLocationProductSearch().Create(&params); err != nil {
 		logx.Errorf("Operation create err: %v", err)
 		util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -69,7 +70,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
 		return
 	}
-	if params.Check() {
+	if !params.Check() {
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父")
 		return
 	}
@@ -89,7 +90,7 @@
 // @Tags      涓婃灦瑙勫垯
 // @Summary   淇敼涓婃灦瑙勫垯
 // @Produce   application/json
-// @Param     object  body request.UpdateLocationProduct true  "鍏ュ簱淇℃伅"
+// @Param     object  body request.UpdateLocationProduct true  "淇敼鍙傛暟"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/locationProduct/update [post]
 func (slf LocationProductController) Update(c *gin.Context) {
@@ -150,7 +151,6 @@
 		util.ResponseFormat(c, code.RequestParamError, "id涓�0")
 		return
 	}
-	//TODO:姝ゅ鍙兘闇�瑕佸鍔犻檺鍒讹紝濡傛灉璇ヤ笂鏋惰鍒欏鏋滃凡缁忎骇鐢熶簡搴撳瓨鏁伴噺锛屽垹闄や細閫犳垚搴撳瓨鏌ヤ笉鍒扮殑褰卞搷
 	if err := models.NewLocationProductSearch().SetID(id).Delete(); err != nil {
 		logx.Errorf("LocationProduct delete err: %v", err)
 		util.ResponseFormat(c, code.SaveFail, "鍒犻櫎澶辫触锛�"+err.Error())

--
Gitblit v1.8.0