From 307c699810c39714e82efac9de56f70b93a718a2 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 31 十月 2023 11:54:23 +0800
Subject: [PATCH] 重订货规则开发

---
 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 88dc93a..afffdb5 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -152,8 +152,8 @@
 	for _, detail := range details {
 		var resp response.InventoryHistory
 		resp.Amount = detail.Amount
-		resp.Unit = params.Unit
-		resp.ProductName = params.ProductName
+		resp.Unit = detail.Product.Unit
+		resp.ProductName = detail.Product.Name
 		for _, operation := range operations {
 			if detail.OperationID == operation.Id {
 				resp.Number = operation.Number
@@ -162,6 +162,7 @@
 				resp.ContactedName = operation.ContacterName
 				resp.FromLocation = operation.FromLocation.Name
 				resp.ToLocation = operation.ToLocation.Name
+				resp.BaseOperationType = operation.BaseOperationType
 				result = append(result, resp)
 				break
 			}

--
Gitblit v1.8.0