From 1cd1206c18ed14dd9ebf2baf477f46c847a271b0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 三月 2024 16:39:19 +0800
Subject: [PATCH] merge
---
model/response/salesDetails.go | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/model/response/salesDetails.go b/model/response/salesDetails.go
index e8035a0..515af69 100644
--- a/model/response/salesDetails.go
+++ b/model/response/salesDetails.go
@@ -6,9 +6,10 @@
)
type Info struct {
- MakeInfo []WorkOrderInfo `json:"makeInfo"`
- PurchaseInfo []Purchase `json:"purchaseInfo"`
- OutsourcingInfo []OutsourcingInfo `json:"outsourcingInfo"`
+ MakeInfo []WorkOrderInfo `json:"makeInfo"`
+ PurchaseInfo []Purchase `json:"purchaseInfo"`
+ OutsourcingInfo []OutsourcingInfo `json:"outsourcingInfo"`
+ ProductInfo []SalesDetailsProductInfo `json:"productInfo"`
}
type WorkOrderInfo struct {
@@ -67,7 +68,6 @@
Amount string `json:"amount"` //鍦ㄥ簱鏁伴噺
AvailableNumber string `json:"availableNumber"` //鍙敤搴撳瓨
}
-
type OutputInfo struct {
Number string `json:"number"`
Name string `json:"name"`
@@ -112,3 +112,24 @@
WarehouseName string `json:"WarehouseName,omitempty"`
ProductList []*model.DeliveryOrder `json:"ProductList,omitempty"`
}
+type SalesDetailsProductInfo struct {
+ ProductId string `json:"productId"`
+ ProductName string `json:"productName"`
+ Specs string `json:"specs"` //鐗╂枡瑙勬牸
+ Unit string `json:"unit"` //鍗曚綅
+ Amount decimal.Decimal `json:"amount"` //璁㈠崟鏁伴噺
+ FinishAmount int64 `json:"finishAmount"` //瀹屾垚鏁伴噺
+ DeliveryAmount int64 `json:"deliveryAmount"` //鍙戣揣鏁伴噺
+ PurchaseAmount int64 `json:"purchaseAmount"` //閲囪喘鏁伴噺
+ PurchaseFinishAmount int64 `json:"purchaseFinishAmount"` //閲囪喘瀹屾垚鏁伴噺
+ MakeAmount int64 `json:"makeAmount"` //鍒堕�犳暟閲�
+ MakeFinishAmount int64 `json:"makeFinishAmount"` //鍒堕�犲畬鎴愭暟閲�
+ OutsourcingAmount int64 `json:"outsourcingAmount"` //濮斿鏁伴噺
+ OutsourcingFinishAmount int64 `json:"outsourcingFinishAmount"` //濮斿瀹屾垚鏁伴噺
+ Cost string `json:"cost"` //浜у搧鎴愭湰
+ Price decimal.Decimal `json:"price"` //浜у搧浠锋牸
+ Total decimal.Decimal `json:"total"` //浜у搧鎬讳环
+ Profit string `json:"profit"` //姣涘埄
+ Margin string `json:"margin"` //姣涘埄鐜�
+
+}
--
Gitblit v1.8.0