From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0

---
 model/request/salesReturn.go |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/model/request/salesReturn.go b/model/request/salesReturn.go
index 9be348a..46d706d 100644
--- a/model/request/salesReturn.go
+++ b/model/request/salesReturn.go
@@ -1,23 +1,40 @@
 package request
 
-import "aps_crm/model"
+import (
+	"aps_crm/constvar"
+	"aps_crm/model"
+)
 
 type AddSalesReturnRequest struct {
 	SalesReturn SalesReturn
 }
 
 type SalesReturn struct {
-	ClientId   int             `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
-	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;comment:閫�璐ф棩鏈�"`
-	Status     int             `json:"status" gorm:"column:status;type:int;comment:閫�璐х姸鎬�"`
-	Reason     string          `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�璐у師鍥�"`
-	Products   []model.Product `json:"products" gorm:"many2many:salesReturn_product;"`
+	ClientId            int                            `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+	SourceType          constvar.SalesReturnSourceType `gorm:"source_type" json:"sourceType"` // 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+	SourceId            int                            `gorm:"source_id" json:"sourceId"`     // 婧愬崟id
+	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_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
 }
 
 type UpdateSalesReturnRequest struct {
-	Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-	SalesReturn
+	Id          int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+	SalesReturn SalesReturn
+}
+
+type GetSalesReturnList struct {
+	PageInfo
+	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