From 137441e2396cf231f9d41e5c399038dbfe01433f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:24:55 +0800
Subject: [PATCH] 添加字段，库存报表统计返回结果添加productType（产品类别）、productSpecs（产品规格），产品类别由原来的productType改为productCategory
---
request/report_forms_request.go | 1 +
service/inventory_report_forms.go | 4 +++-
response/report_forms_response.go | 2 ++
main.go | 2 ++
4 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/main.go b/main.go
index a2ea7c2..29e5445 100644
--- a/main.go
+++ b/main.go
@@ -47,6 +47,8 @@
ReadTimeout: 5 * time.Second,
WriteTimeout: 5 * time.Second,
}
+ logx.Infof("server start success! \n\n\t- Local: \thttp://localhost:%v/\n\t- Network: \thttp://%v:%v/\n",
+ conf.WebConf.Port, conf.WebConf.Host, conf.WebConf.Port)
go shutdown(server)
//鍚姩grpc瀹㈡埛绔�
//go controllers.InitInventoryOrderServiceConn()
diff --git a/request/report_forms_request.go b/request/report_forms_request.go
index ad59fb9..b1b6a02 100644
--- a/request/report_forms_request.go
+++ b/request/report_forms_request.go
@@ -17,6 +17,7 @@
Unit string `json:"unit"` //鍗曚綅
KeyWord string `json:"keyWord"` //鎼滅储鏉′欢
BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
+ WarehouseId string `json:"warehouseId"` // 浠撳簱ID
WarehouseCode string `json:"warehouseCode"`
}
diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index cfa6570..3df17ff 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -10,6 +10,8 @@
ProduceId string `json:"produceId"` //浜у搧id
ProductName string `json:"productName"` //浜у搧鍚嶇О
ProductType string `json:"productType"` //浜у搧绫诲瀷
+ ProductCategory string `json:"productCategory"` //浜у搧绫诲埆
+ ProductSpecs string `json:"productSpecs"` //浜у搧瑙勬牸
Cost decimal.Decimal `json:"cost"` //鎴愭湰
Value decimal.Decimal `json:"value"` //鎬讳环鍊�
Amount decimal.Decimal `json:"amount"` //鍦ㄥ簱鏁伴噺
diff --git a/service/inventory_report_forms.go b/service/inventory_report_forms.go
index 45d3795..b00d906 100644
--- a/service/inventory_report_forms.go
+++ b/service/inventory_report_forms.go
@@ -87,7 +87,9 @@
data.Cost = material.Cost
data.Unit = material.Unit
data.Value = material.Amount.Mul(material.Cost)
- data.ProductType = material.CategoryName
+ data.ProductCategory = material.CategoryName
+ data.ProductType = material.Type
+ data.ProductSpecs = material.Specs
for _, amount := range productAmounts {
if material.ID == amount.ProductId {
data.Amount = data.Amount.Add(amount.Amount)
--
Gitblit v1.8.0