From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口
---
response/report_forms_response.go | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index 4a60e50..cfa6570 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -3,44 +3,54 @@
import (
"github.com/shopspring/decimal"
"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 {
- Number string `json:"number"` //鍗曞彿
- Date string `json:"date"` //鏃ユ湡
- ProductName string `json:"productName"` //浜у搧鍚嶇О
- FromLocation string `json:"fromLocation"` //婧愪綅缃�
- ToLocation string `json:"toLocation"` //鐩爣浣嶇疆
- Amount decimal.Decimal `json:"amount"` //鏁伴噺
- Unit string `json:"unit"` //鍗曚綅
- ContactedName string `json:"contactedName"` //瀹屾垚鑰�
- Status string `json:"status"` //鐘舵��
- BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
- Weight decimal.Decimal `json:"weight"` //閲嶉噺
+ Number string `json:"number"` //鍗曞彿
+ Date string `json:"date"` //鏃ユ湡
+ ProductName string `json:"productName"` //浜у搧鍚嶇О
+ FromLocation string `json:"fromLocation"` //婧愪綅缃�
+ ToLocation string `json:"toLocation"` //鐩爣浣嶇疆
+ Amount decimal.Decimal `json:"amount"` //鏁伴噺
+ AmountMoreUnits []models.UnitItems `json:"amountMoreUnits" gorm:"-"` //鏁伴噺澶氬崟浣�
+ Unit string `json:"unit"` //鍗曚綅
+ ContactedName string `json:"contactedName"` //瀹屾垚鑰�
+ Status string `json:"status"` //鐘舵��
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
+ Weight decimal.Decimal `json:"weight"` //閲嶉噺
ProductId string `json:"productId"`
FromLocationId int `json:"fromLocationId"`
ToLocationId int `json:"toLocationId"`
+ OperationId int `json:"operationId"`
+ OperationTypeName string `json:"operationTypeName"` //浣滀笟绫诲瀷鍚嶇О
}
type LocationForms struct {
- ProduceId string `json:"produceId"` //浜у搧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