From 7d80867c1d2d8340da8e106b4af2ceaba3fc9fc1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 三月 2024 19:16:50 +0800
Subject: [PATCH] 增加发货完成按钮

---
 model/request/salesDetails.go |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/model/request/salesDetails.go b/model/request/salesDetails.go
index 4915b69..33ac99e 100644
--- a/model/request/salesDetails.go
+++ b/model/request/salesDetails.go
@@ -3,6 +3,7 @@
 import (
 	"aps_crm/constvar"
 	"aps_crm/model"
+	"github.com/shopspring/decimal"
 )
 
 type AddSalesDetails struct {
@@ -11,11 +12,13 @@
 
 type SalesDetails struct {
 	ClientId            int                         `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+	Client              model.Client                `json:"client" gorm:"foreignKey:ClientId"`
 	Number              string                      `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞槑缁嗗崟鍙�"`
 	SaleChanceId        int                         `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"`
 	SaleType            int                         `json:"saleType" gorm:"column:sale_type;type:int;comment:閿�鍞被鍨�"`
 	SignTime            string                      `json:"signTime" gorm:"column:sign_time;type:datetime;comment:绛惧崟鏃堕棿"`
 	MemberId            int                         `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+	Member              model.User                  `json:"Member"  gorm:"foreignKey:MemberId"`
 	DeliveryDate        string                      `json:"deliveryDate" gorm:"column:delivery_date;type:datetime;comment:浜よ揣鏃ユ湡"`
 	WechatOrderStatusId int                         `json:"wechatOrderStatusId" gorm:"column:wechat_order_status_id;type:int;comment:寰俊璁㈠崟鐘舵�乮d"`
 	Address             string                      `json:"address" gorm:"column:address;type:varchar(255);comment:鍦板潃"`
@@ -32,6 +35,7 @@
 	QuotationId         int                         `json:"quotationId" gorm:"column:quotation_id;type:int;comment:鎶ヤ环鍗昳d"`
 	Status              constvar.SalesDetailsStatus `json:"status" gorm:"column:status;type:int;comment:鐘舵��"`
 	Source              string                      `json:"source" gorm:"column:source;type:varchar(255);comment:璁㈠崟鏉ユ簮"`
+	ProjectId           string                      `json:"projectId" gorm:"column:project_id;type:varchar(255);comment:aps椤圭洰id"`
 }
 
 type UpdateSalesDetails struct {
@@ -52,3 +56,19 @@
 	ClientId     int                              `json:"clientId"`     //瀹㈡埛id
 	Number       string                           `json:"number"`       //閿�鍞槑缁嗗崟鍙�
 }
+
+// ConfirmOutput 鍙戣揣
+type ConfirmOutput struct {
+	SaleDetailNumber string                  `json:"saleDetailNumber"`
+	Products         []ConfirmOutputProducts `json:"products"`
+}
+
+// ConfirmOutputOver 纭鍙戣揣瀹屾垚
+type ConfirmOutputOver struct {
+	SaleDetailNumber string `json:"saleDetailNumber"`
+}
+
+type ConfirmOutputProducts struct {
+	Number       string          `json:"number"`       //浜у搧缂栧彿
+	OutputAmount decimal.Decimal `json:"outputAmount"` //鏈鍙戣揣鏁伴噺
+}

--
Gitblit v1.8.0