From 1e65185f0ecb8d4f8f1fd9ea822137e0c841a47f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 30 三月 2024 17:30:38 +0800
Subject: [PATCH] crm获取发货数量

---
 model/response/salesDetails.go |   58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/model/response/salesDetails.go b/model/response/salesDetails.go
index e8035a0..f47b2b3 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 {
@@ -64,25 +65,25 @@
 	SalePrice       string `json:"salePrice"` //閿�鍞崟浠�
 	Valorem         string `json:"valorem"`   //浠风◣鍚堣
 	Warehouse       string `json:"warehouse"`
-	Amount          string `json:"amount"`          //鍦ㄥ簱鏁伴噺
+	Amount          string `json:"amount"`          //鍑哄簱鏁伴噺
 	AvailableNumber string `json:"availableNumber"` //鍙敤搴撳瓨
+	Status          int    `json:"status"`          //0灏辩华 1瀹屾垚
 }
-
 type OutputInfo struct {
-	Number      string `json:"number"`
-	Name        string `json:"name"`
+	Number      string `json:"number"`      //浜у搧缂栫爜
+	Name        string `json:"name"`        //浜у搧鍚嶇О
 	OrderAmount string `json:"orderAmount"` //璁㈠崟鏁伴噺
-	Unit        string `json:"unit"`
-	Invoice     string `json:"invoice"`   //鍙戣揣鍗�
-	Carrier     string `json:"carrier"`   //鎵胯繍鍟�
-	Waybill     string `json:"waybill"`   //杩愬崟鍙�
-	SalePrice   string `json:"salePrice"` //閿�鍞崟浠�
-	Valorem     string `json:"valorem"`   //浠风◣鍚堣
-	Warehouse   string `json:"warehouse"`
-	Amount      string `json:"amount"`     //鍦ㄥ簱鏁伴噺
-	Status      int    `json:"status"`     //0灏辩华 1瀹屾垚
-	Specs       string `json:"specs"`      //瑙勬牸
-	CreateTime  string `json:"createTime"` //鍒涘缓鏃堕棿
+	Unit        string `json:"unit"`        //鍗曚綅
+	Invoice     string `json:"invoice"`     //鍙戣揣鍗�
+	Carrier     string `json:"carrier"`     //鎵胯繍鍟�
+	Waybill     string `json:"waybill"`     //杩愬崟鍙�
+	SalePrice   string `json:"salePrice"`   //閿�鍞崟浠�
+	Valorem     string `json:"valorem"`     //浠风◣鍚堣
+	Warehouse   string `json:"warehouse"`   //浠撳簱鍚嶇О
+	Amount      string `json:"amount"`      //鍙戣揣鏁伴噺
+	Status      int    `json:"status"`      //0灏辩华 1瀹屾垚
+	Specs       string `json:"specs"`       //瑙勬牸
+	CreateTime  string `json:"createTime"`  //鍒涘缓鏃堕棿
 }
 
 type StoreInfo struct {
@@ -112,3 +113,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          int             `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