From ee8c1c18382dce5394677b1066385d7ef276c2f1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 22:59:16 +0800
Subject: [PATCH] 库存报表查询及报表下载支持多单位

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

diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index 5d4f159..aee3590 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -4,19 +4,24 @@
 	"github.com/shopspring/decimal"
 	"time"
 	"wms/constvar"
+	"wms/models"
 )
 
 type InventoryForms struct {
-	ProduceId       string          `json:"produceId"`       //浜у搧id
-	ProductName     string          `json:"productName"`     //浜у搧鍚嶇О
-	ProductType     string          `json:"productType"`     //浜у搧绫诲瀷
-	Cost            decimal.Decimal `json:"cost"`            //鎴愭湰
-	Value           decimal.Decimal `json:"value"`           //鎬讳环鍊�
-	Amount          decimal.Decimal `json:"amount"`          //鍦ㄥ簱鏁伴噺
-	AvailableNumber decimal.Decimal `json:"availableNumber"` //鍙敤搴撳瓨
-	In              decimal.Decimal `json:"in"`              //鍏ュ簱
-	Out             decimal.Decimal `json:"out"`             //鍑哄簱
-	Unit            string          `json:"unit"`            //鍗曚綅
+	ProduceId                string             `json:"produceId"`                //浜у搧id
+	ProductName              string             `json:"productName"`              //浜у搧鍚嶇О
+	ProductType              string             `json:"productType"`              //浜у搧绫诲瀷
+	Cost                     decimal.Decimal    `json:"cost"`                     //鎴愭湰
+	Value                    decimal.Decimal    `json:"value"`                    //鎬讳环鍊�
+	Amount                   decimal.Decimal    `json:"amount"`                   //鍦ㄥ簱鏁伴噺
+	AmountMoreUnits          []models.UnitItems `json:"amountMoreUnits"`          //鍦ㄥ簱鏁伴噺澶氬崟浣�
+	AvailableNumber          decimal.Decimal    `json:"availableNumber"`          //鍙敤搴撳瓨
+	AvailableNumberMoreUnits []models.UnitItems `json:"availableNumberMoreUnits"` //鍙敤搴撳瓨澶氬崟浣�
+	In                       decimal.Decimal    `json:"in"`                       //鍏ュ簱
+	InMoreUnits              []models.UnitItems `json:"inMoreUnits"`              //鍏ュ簱澶氬崟浣�
+	Out                      decimal.Decimal    `json:"out"`                      //鍑哄簱
+	OutMoreUnits             []models.UnitItems `json:"outMoreUnits"`             //鍑哄簱澶氬崟浣�
+	Unit                     string             `json:"unit"`                     //鍗曚綅
 }
 
 type InventoryHistory struct {

--
Gitblit v1.8.0