From f89bbcf77dae0465e829ca6f7548cd36ef57aaa6 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 22 九月 2023 16:37:06 +0800
Subject: [PATCH] 1.调拨接口

---
 controllers/operation.go |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 97f68b3..8eca517 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -128,13 +128,12 @@
 // @Tags      鍏ュ簱/鍑哄簱
 // @Summary   鍏ュ簱/鍑哄簱鍒楄〃
 // @Produce   application/json
-// @Accept	  json
-// @Param     object  query  request.OperationList true  "鍙傛暟"
-// @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/operation/operation [get]
+// @Param		 object  body  request.OperationList true  "鏌ヨ鍙傛暟"
+// @Success   200 {object} util.Response	"鎴愬姛"
+// @Router    /api-wms/v1/operation/list [post]
 func (slf OperationController) List(c *gin.Context) {
 	var params request.OperationList
-	if err := c.ShouldBindQuery(&params); err != nil {
+	if err := c.BindJSON(&params); err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
 		return
 	}
@@ -144,13 +143,19 @@
 	}
 	search := models.NewOperationSearch()
 	search.SetPage(params.Page, params.PageSize)
+	if params.Number != "" {
+		search.SetNumber(params.Number)
+	}
+	if params.SourceNumber != "" {
+		search.SetSourceNumber(params.SourceNumber)
+	}
 	list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
 		return
 	}
 
-	util.ResponseFormatList(c, code.Success, list, int(total))
+	util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
 
 }
 
@@ -344,3 +349,39 @@
 	}
 	util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
 }
+
+// ListAll
+// @Tags      鍏ュ簱/鍑哄簱
+// @Summary   璋冩嫧
+// @Produce   application/json
+// @Param     object  body  request.OperationAllList true  "鍙傛暟"
+// @Success   200 {object} util.Response "鎴愬姛"
+// @Router    /api-wms/v1/operation/listAll [post]
+func (slf OperationController) ListAll(c *gin.Context) {
+	var params request.OperationAllList
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+		return
+	}
+	if !params.PageInfo.Check() {
+		util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+		return
+	}
+	search := models.NewOperationSearch()
+	search.SetPage(params.Page, params.PageSize)
+	search.SetPage(params.Page, params.PageSize)
+	if params.Number != "" {
+		search.SetNumber(params.Number)
+	}
+	if params.SourceNumber != "" {
+		search.SetSourceNumber(params.SourceNumber)
+	}
+	list, total, err := search.SetPreload(true).SetOrder("created_at desc").Find()
+	if err != nil {
+		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+		return
+	}
+
+	util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
+
+}

--
Gitblit v1.8.0