From b0d1fe4e0acb0fa40c684069c0e9d77d7a65ace3 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 17 十月 2023 15:53:53 +0800 Subject: [PATCH] fix --- model/request/salesReturn.go | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/model/request/salesReturn.go b/model/request/salesReturn.go index 8da7dbc..3c85395 100644 --- a/model/request/salesReturn.go +++ b/model/request/salesReturn.go @@ -3,6 +3,7 @@ import ( "aps_crm/constvar" "aps_crm/model" + "aps_crm/proto/code" ) type AddSalesReturnRequest struct { @@ -16,12 +17,14 @@ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閫�璐у崟鍙�"` Repository string `json:"repository" gorm:"column:repository;type:varchar(255);comment:浠撳簱"` MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` - ReturnDate string `json:"returnDate" gorm:"column:return_date;type:datetime(3);comment:閫�璐ф棩鏈�"` //閫�璐ф棩鏈� - SalesReturnStatusId int `json:"salesReturnStatusId" gorm:"column:sales_return_status;type:int;comment:閫�璐х姸鎬�"` //閫�璐х姸鎬乮d - CreatorId int `json:"-" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"` //鍒涘缓浜篒D - Creator User `json:"-" gorm:"foreignKey:CreatorId"` //鍒涘缓浜轰俊鎭� - Reason string `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�璐у師鍥�"` //閫�璐у師鍥� - Products []*model.Product `json:"products" gorm:"many2many:salesReturn_product;"` //閫�璐т骇鍝� + ReturnDate string `json:"returnDate" gorm:"column:return_date;type:datetime(3);comment:閫�璐ф棩鏈�"` //閫�璐ф棩鏈� + SalesReturnStatusId int `json:"salesReturnStatusId" gorm:"column:sales_return_status_id;type:int;comment:閫�璐х姸鎬�"` //閫�璐х姸鎬乮d + CreatorId int `json:"-" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"` //鍒涘缓浜篒D + Creator User `json:"-" gorm:"foreignKey:CreatorId"` //鍒涘缓浜轰俊鎭� + Reason string `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�璐у師鍥�"` //閫�璐у師鍥� + Products []*model.Product `json:"products" gorm:"many2many:salesReturn_product;"` //閫�璐т骇鍝� + CodeStandID string `json:"codeStandID"` //缂栫爜id + CodeRule code.CodeStandard `json:"codeRule"` } type UpdateSalesReturnRequest struct { @@ -31,5 +34,9 @@ type GetSalesReturnList struct { PageInfo - Keyword string `json:"keyword"` + Keyword string `json:"keyword"` + KeywordType constvar.SalesReturnKeywordType + SourceType constvar.SalesReturnSourceType `json:"sourceType"` // 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級 + SourceId int `json:"sourceId"` // 婧愬崟id + ClientId int `json:"clientId"` //瀹㈡埛id } -- Gitblit v1.8.0