From f11fabc18b21c2f80441ded025bb1910fd0d9a2f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 31 十月 2023 17:59:51 +0800
Subject: [PATCH] update

---
 model/request/invoice.go |   62 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/model/request/invoice.go b/model/request/invoice.go
index 526af5f..f22f4f1 100644
--- a/model/request/invoice.go
+++ b/model/request/invoice.go
@@ -6,41 +6,45 @@
 )
 
 type AddInvoice struct {
-	ClientId         int                        `gorm:"client_id" json:"clientId"`                  // 瀹㈡埛id
-	InvoiceTypeId    int                        `gorm:"invoice_type_id" json:"invoiceTypeId"`       // 鍙戠エ绫诲瀷id
-	PrincipalId      int                        `gorm:"principal_id" json:"principalId"`            // 閿�鍞礋璐d汉id
-	Subject          string                     `gorm:"subject" json:"subject"`                     // 涓婚
-	InvoiceStatusId  int                        `gorm:"invoice_status_id" json:"invoiceStatusId"`   // 鍙戠エ鐘舵�乮d
-	SourceType       constvar.InvoiceSourceType `gorm:"source_type" json:"sourceType"`              // 婧愬崟绫诲瀷(1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓)
-	SourceId         int                        `gorm:"source_id" json:"sourceId"`                  // 婧愬崟id
-	TaxpayerIdNumber string                     `gorm:"taxpayer_id_number" json:"taxpayerIdNumber"` // 绾崇◣璇嗗埆鍙�
-	InvoiceNumber    string                     `gorm:"invoice_number" json:"invoiceNumber"`        // 鍙戠エ鍙风爜
-	InvoiceDate      string                     `gorm:"invoice_date" json:"invoiceDate"`            // 寮�绁ㄦ棩鏈�
-	CourierNumber    string                     `gorm:"courier_number" json:"courierNumber"`        // 鐗╂祦鍗曞彿
-	CourierCompanyId int                        `gorm:"courier_company_id" json:"courierCompanyId"` // 鐗╂祦鍏徃
-	Products         []model.Product            `json:"products"`                                   //鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+	Number           string                     `json:"number" gorm:"column:number;type:varchar(255);comment:鍙戠エ缂栧彿"` //鍙戠エ缂栧彿
+	ClientId         int                        `gorm:"client_id" json:"clientId"`                                  // 瀹㈡埛id
+	InvoiceTypeId    int                        `gorm:"invoice_type_id" json:"invoiceTypeId"`                       // 鍙戠エ绫诲瀷id
+	PrincipalId      int                        `gorm:"principal_id" json:"principalId"`                            // 閿�鍞礋璐d汉id
+	Subject          string                     `gorm:"subject" json:"subject"`                                     // 涓婚
+	InvoiceStatusId  int                        `gorm:"invoice_status_id" json:"invoiceStatusId"`                   // 鍙戠エ鐘舵�乮d
+	SourceType       constvar.InvoiceSourceType `gorm:"source_type" json:"sourceType"`                              // 婧愬崟绫诲瀷(1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓)
+	SourceId         int                        `gorm:"source_id" json:"sourceId"`                                  // 婧愬崟id
+	TaxpayerIdNumber string                     `gorm:"taxpayer_id_number" json:"taxpayerIdNumber"`                 // 绾崇◣璇嗗埆鍙�
+	InvoiceNumber    string                     `gorm:"invoice_number" json:"invoiceNumber"`                        // 鍙戠エ鍙风爜
+	InvoiceDate      string                     `gorm:"invoice_date" json:"invoiceDate"`                            // 寮�绁ㄦ棩鏈�
+	CourierNumber    string                     `gorm:"courier_number" json:"courierNumber"`                        // 鐗╂祦鍗曞彿
+	CourierCompanyId int                        `gorm:"courier_company_id" json:"courierCompanyId"`                 // 鐗╂祦鍏徃
+	Products         []model.Product            `json:"products"`                                                   //鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+	CodeStandID      string                     `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
 }
 
 type UpdateInvoice struct {
 	Id               int             `json:"id" binding:"required"`
-	ClientId         int             `gorm:"client_id" json:"clientId"`                  // 瀹㈡埛id
-	InvoiceTypeId    int             `gorm:"invoice_type_id" json:"invoiceTypeId"`       // 鍙戠エ绫诲瀷id
-	PrincipalId      int             `gorm:"principal_id" json:"principalId"`            // 閿�鍞礋璐d汉id
-	Subject          string          `gorm:"subject" json:"subject"`                     // 涓婚
-	InvoiceStatusId  int             `gorm:"invoice_status_id" json:"invoiceStatusId"`   // 鍙戠エ鐘舵�乮d
-	SourceType       int             `gorm:"source_type" json:"sourceType"`              // 婧愬崟绫诲瀷(1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓)
-	SourceId         int             `gorm:"source_id" json:"sourceId"`                  // 婧愬崟id
-	TaxpayerIdNumber string          `gorm:"taxpayer_id_number" json:"taxpayerIdNumber"` // 绾崇◣璇嗗埆鍙�
-	InvoiceNumber    string          `gorm:"invoice_number" json:"invoiceNumber"`        // 鍙戠エ鍙风爜
-	InvoiceDate      int             `gorm:"invoice_date" json:"invoiceDate"`            // 寮�绁ㄦ棩鏈�
-	CourierNumber    string          `gorm:"courier_number" json:"courierNumber"`        // 鐗╂祦鍗曞彿
-	CourierCompanyId int             `gorm:"courier_company_id" json:"courierCompanyId"` // 鐗╂祦鍏徃
-	Products         []model.Product `json:"products"`                                   //鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+	Number           string          `json:"number" gorm:"column:number;type:varchar(255);comment:鍙戠エ缂栧彿"` //鍙戠エ缂栧彿
+	ClientId         int             `gorm:"client_id" json:"clientId"`                                  // 瀹㈡埛id
+	InvoiceTypeId    int             `gorm:"invoice_type_id" json:"invoiceTypeId"`                       // 鍙戠エ绫诲瀷id
+	PrincipalId      int             `gorm:"principal_id" json:"principalId"`                            // 閿�鍞礋璐d汉id
+	Subject          string          `gorm:"subject" json:"subject"`                                     // 涓婚
+	InvoiceStatusId  int             `gorm:"invoice_status_id" json:"invoiceStatusId"`                   // 鍙戠エ鐘舵�乮d
+	SourceType       int             `gorm:"source_type" json:"sourceType"`                              // 婧愬崟绫诲瀷(1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓)
+	SourceId         int             `gorm:"source_id" json:"sourceId"`                                  // 婧愬崟id
+	TaxpayerIdNumber string          `gorm:"taxpayer_id_number" json:"taxpayerIdNumber"`                 // 绾崇◣璇嗗埆鍙�
+	InvoiceNumber    string          `gorm:"invoice_number" json:"invoiceNumber"`                        // 鍙戠エ鍙风爜
+	InvoiceDate      int             `gorm:"invoice_date" json:"invoiceDate"`                            // 寮�绁ㄦ棩鏈�
+	CourierNumber    string          `gorm:"courier_number" json:"courierNumber"`                        // 鐗╂祦鍗曞彿
+	CourierCompanyId int             `gorm:"courier_company_id" json:"courierCompanyId"`                 // 鐗╂祦鍏徃
+	Products         []model.Product `json:"products"`                                                   //鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+	CodeStandID      string          `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
 }
 
 type GetInvoiceList struct {
 	PageInfo
-	QueryClass  constvar.InvoiceQueryClass  `json:"queryClass" form:"queryClass"`
-	KeywordType constvar.InvoiceKeywordType `json:"keywordType"  form:"keywordType"`
-	Keyword     string                      `json:"keyword" form:"keyword"`
+	SourceId     int                        `json:"sourceId"`
+	SourceType   constvar.InvoiceSourceType `json:"sourceType"` // 婧愬崟绫诲瀷(1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓)
+	PrincipalIds []int
 }

--
Gitblit v1.8.0