From 7d4f02f6a8066018911d09bad42c5c540abaa66b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 11 三月 2024 15:18:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

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

diff --git a/controllers/location_product.go b/controllers/location_product.go
index 5955d2c..6089724 100644
--- a/controllers/location_product.go
+++ b/controllers/location_product.go
@@ -97,7 +97,7 @@
 // @Success   200 {object} util.Response	"鎴愬姛"
 // @Router    /api-wms/v1/locationProduct/list [post]
 func (slf LocationProductController) List(c *gin.Context) {
-	var params request.PageInfo
+	var params request.QueryLocationProductConditon
 	if err := c.BindJSON(&params); err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
 		return
@@ -109,6 +109,14 @@
 
 	search := models.NewLocationProductSearch()
 	search.SetPage(params.Page, params.PageSize)
+
+	if params.ProductId != "" {
+		search = search.SetProductId(params.ProductId)
+	}
+
+	if params.ProductCategoryId != 0 {
+		search = search.SetProductCategoryId(params.ProductCategoryId)
+	}
 	list, total, err := search.SetPreload(true).SetOrder("created_at desc").FindByPage()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())

--
Gitblit v1.8.0