From 97f8c17ef33e511d515164f1b1f00dd0fb9cd01f Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 18 十月 2023 09:56:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index d9ea817..db62c73 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -134,7 +134,7 @@
for _, detail := range details {
operationIds = append(operationIds, detail.OperationID)
}
- //鑾峰彇鎿嶄綔璁板綍
+ //鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
operations, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
@@ -145,11 +145,12 @@
var resp response.InventoryHistory
resp.Amount = detail.Amount
resp.Unit = params.Unit
+ resp.ProductName = params.ProductName
for _, operation := range operations {
if detail.OperationID == operation.Id {
resp.Number = operation.Number
resp.Date = operation.UpdateTime
- resp.BaseOperationType = operation.BaseOperationType
+ resp.Status = "瀹屾垚"
resp.ContactedName = operation.ContacterName
resp.FromLocation = operation.FromLocation.Name
resp.ToLocation = operation.ToLocation.Name
--
Gitblit v1.8.0