From 2f856eaa7e46c884f1cb7ad721919a086d7f34a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 13 六月 2024 15:57:45 +0800
Subject: [PATCH] 出入库明细列表和报表增加多单位

---
 response/report_forms_response.go |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index aee3590..a302424 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -31,6 +31,7 @@
 	FromLocation      string                     `json:"fromLocation"`      //婧愪綅缃�
 	ToLocation        string                     `json:"toLocation"`        //鐩爣浣嶇疆
 	Amount            decimal.Decimal            `json:"amount"`            //鏁伴噺
+	AmountMoreUnits   []models.UnitItems         `json:"amountMoreUnits"`   //鏁伴噺澶氬崟浣�
 	Unit              string                     `json:"unit"`              //鍗曚綅
 	ContactedName     string                     `json:"contactedName"`     //瀹屾垚鑰�
 	Status            string                     `json:"status"`            //鐘舵��
@@ -44,12 +45,13 @@
 }
 
 type LocationForms struct {
-	ProduceId       string          `json:"produceId"`       //浜у搧id
-	LocationId      int             `json:"locationId"`      //浣嶇疆id
-	LocationName    string          `json:"locationName"`    //浣嶇疆鍚嶇О
-	ProductName     string          `json:"productName"`     //浜у搧鍚嶇О
-	ProductTypeName string          `json:"productTypeName"` //浜у搧绫诲埆
-	Amount          decimal.Decimal `json:"amount"`          //鏁伴噺
-	Unit            string          `json:"unit"`            //鍗曚綅
-	Value           decimal.Decimal `json:"value"`           //鎬讳环鍊�
+	ProduceId       string             `json:"produceId"`       //浜у搧id
+	LocationId      int                `json:"locationId"`      //浣嶇疆id
+	LocationName    string             `json:"locationName"`    //浣嶇疆鍚嶇О
+	ProductName     string             `json:"productName"`     //浜у搧鍚嶇О
+	ProductTypeName string             `json:"productTypeName"` //浜у搧绫诲埆
+	Amount          decimal.Decimal    `json:"amount"`          //鏁伴噺
+	AmountMoreUnits []models.UnitItems `json:"amountMoreUnits"` //鍦ㄥ簱鏁伴噺澶氬崟浣�
+	Unit            string             `json:"unit"`            //鍗曚綅
+	Value           decimal.Decimal    `json:"value"`           //鎬讳环鍊�
 }

--
Gitblit v1.8.0