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 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/model/response/salesDetails.go b/model/response/salesDetails.go
index ec7d90f..515af69 100644
--- a/model/response/salesDetails.go
+++ b/model/response/salesDetails.go
@@ -1,6 +1,9 @@
package response
-import "github.com/shopspring/decimal"
+import (
+ "aps_crm/model"
+ "github.com/shopspring/decimal"
+)
type Info struct {
MakeInfo []WorkOrderInfo `json:"makeInfo"`
@@ -65,7 +68,50 @@
Amount string `json:"amount"` //鍦ㄥ簱鏁伴噺
AvailableNumber string `json:"availableNumber"` //鍙敤搴撳瓨
}
+type OutputInfo struct {
+ 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"` //鍒涘缓鏃堕棿
+}
+type StoreInfo struct {
+ Name string `json:"name"` //浜у搧鍚嶇О
+ Number string `json:"number"` //浜у搧缂栧彿
+ OrderAmount decimal.Decimal `json:"orderAmount"` //璁㈠崟鏁伴噺
+ FinishAmount decimal.Decimal `json:"finishAmount"` //璁㈠崟瀹屾垚鏁伴噺
+ LeftAmount decimal.Decimal `json:"leftAmount"` //鏈彂璐ф暟閲�
+ AvailableAmount decimal.Decimal `json:"availableAmount"` //鍓╀綑鍙敤鏁伴噺
+}
+
+type OutputSimpleInfo struct {
+ Number string `json:"number"` //浜у搧缂栧彿
+ Amount decimal.Decimal `json:"amount"` //鍦ㄥ簱鏁伴噺
+ Status int `json:"status"` //0灏辩华 1瀹屾垚
+}
+
+type WarehouseProducts struct {
+ WarehouseID string `protobuf:"bytes,1,opt,name=WarehouseID,proto3" json:"WarehouseID,omitempty"`
+ WarehouseName string `protobuf:"bytes,2,opt,name=WarehouseName,proto3" json:"WarehouseName,omitempty"`
+ ProductList []*ProductInfo `protobuf:"bytes,3,rep,name=ProductList,proto3" json:"ProductList,omitempty"`
+ ProductInfoMap map[string]*ProductInfo
+}
+
+type WarehouseProductInfo struct {
+ WarehouseID string `json:"WarehouseID,omitempty"`
+ WarehouseName string `json:"WarehouseName,omitempty"`
+ ProductList []*model.DeliveryOrder `json:"ProductList,omitempty"`
+}
type SalesDetailsProductInfo struct {
ProductId string `json:"productId"`
ProductName string `json:"productName"`
@@ -85,4 +131,5 @@
Total decimal.Decimal `json:"total"` //浜у搧鎬讳环
Profit string `json:"profit"` //姣涘埄
Margin string `json:"margin"` //姣涘埄鐜�
+
}
--
Gitblit v1.8.0