From 80c8e74c7428329f06d1aa3b70b95b46da732b0a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 27 六月 2024 20:09:03 +0800
Subject: [PATCH] 保存库存结算时间点重启定时任务

---
 controllers/operation_type.go |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/controllers/operation_type.go b/controllers/operation_type.go
index 0ce0a9b..9b0525e 100644
--- a/controllers/operation_type.go
+++ b/controllers/operation_type.go
@@ -116,7 +116,12 @@
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-	list, total, err := models.NewOperationTypeSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetOrder("id desc").SetPreload(true).Find()
+	list, total, err := models.NewOperationTypeSearch().
+		SetPage(params.Page, params.PageSize).
+		SetKeyword(params.Keyword).
+		SetOrder("id desc").
+		SetWarehouseId(params.WarehouseId).
+		SetPreload(true).Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触")
 		return
@@ -140,6 +145,9 @@
 		}
 		if value, ok := mapStatistics[strconv.Itoa(v.Id)+string(constvar.OperationStatus_Finish)]; ok {
 			list[k].FinishCount = value.Count
+		}
+		if value, ok := mapStatistics[strconv.Itoa(v.Id)+string(constvar.OperationStatus_Cancel)]; ok {
+			list[k].CancelCount = value.Count
 		}
 	}
 	util.ResponseFormatListWithPage(c, code.Success, list, cast.ToInt(total), params.Page, params.PageSize)
@@ -205,6 +213,9 @@
 		if value, ok := mapStatistics[strconv.Itoa(v.Id)+string(constvar.OperationStatus_Finish)]; ok {
 			list[k].FinishCount = value.Count
 		}
+		if value, ok := mapStatistics[strconv.Itoa(v.Id)+string(constvar.OperationStatus_Cancel)]; ok {
+			list[k].FinishCount = value.Count
+		}
 	}
 	util.ResponseFormatListWithPage(c, code.Success, list, cast.ToInt(total), params.Page, params.PageSize)
 }

--
Gitblit v1.8.0