From 4041b5571482c5515d15857f59b14a72045350c6 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 23 十月 2023 12:05:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 controllers/operation.go |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index dc07598..7f0bad0 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -128,8 +128,8 @@
 		return errors.New("璇峰～鍏ユ簮鍗曞彿")
 	}
 
-	if params.OperationTypeId == 0 {
-		return errors.New("operationTypeId涓�0")
+	if params.OperationTypeId == 0 || int(params.BaseOperationType) == 0 {
+		return errors.New("鏈瘑鍒璁板綍绫诲瀷")
 	}
 
 	if params.OperationDate == "" {
@@ -177,6 +177,9 @@
 	search.SetPage(params.Page, params.PageSize)
 	if params.Number != "" {
 		search.SetKeyword(params.Number)
+	}
+	if int(params.Status) != 0 {
+		search.SetStatus(params.Status)
 	}
 	list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
 	if err != nil {
@@ -440,14 +443,14 @@
 	util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
 }
 
-// ListAll
+// listTransfer
 // @Tags      鍏ュ簱/鍑哄簱
-// @Summary   璋冩嫧
+// @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) {
+// @Router    /api-wms/v1/operation/listTransfer [post]
+func (slf OperationController) ListTransfer(c *gin.Context) {
 	var params request.OperationAllList
 	if err := c.BindJSON(&params); err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
@@ -463,7 +466,7 @@
 	if params.Number != "" {
 		search.SetKeyword(params.Number)
 	}
-	list, total, err := search.SetPreload(true).SetOrder("created_at desc").Find()
+	list, total, err := search.SetPreload(true).SetBaseOperationType(constvar.BaseOperationTypeInternal).SetOrder("created_at desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
 		return

--
Gitblit v1.8.0