From 1e1eff926a1a331f29b225a41343fd9ecb01fe66 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:19:50 +0800
Subject: [PATCH] 添加字段,嘉联仓储添加 SilkMarket(庄口)、SilkMarketClose(庄口是否关闭)字段

---
 models/operation.go |   85 ++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/models/operation.go b/models/operation.go
index 8fdf2a2..66a33be 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -10,57 +10,60 @@
 )
 
 type (
-	// Operation 鎿嶄綔琛�
+	// Operation 搴撳瓨鎿嶄綔琛�
 	Operation struct {
 		WmsModel
 		Id                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		Number            string                   `json:"number" gorm:"type:varchar(255)"`                           //鍗曞彿
-		SourceNumber      string                   `json:"sourceNumber" gorm:"index;type:varchar(255)"`               //婧愬崟鍙�
-		OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"`   //浣滀笟绫诲瀷id
-		OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:浣滀笟绫诲瀷鍚嶇О"` //浣滀笟绫诲瀷鍚嶇О
-		Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"`            //鐘舵��
-		OperationDate     string                   `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
-		ContacterID       int                      `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
-		ContacterName     string                   `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
-		CompanyID         string                   `json:"companyID" gorm:"type:varchar(255);comment:鍏徃ID-瀹㈡埛"`
-		CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
-		Comment           string                   `json:"comment" gorm:"type:text;comment:澶囨敞"`
-		LogisticCompanyId string                   `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
-		LogisticCompany   LogisticCompany          `json:"logisticCompany"      gorm:"foreignKey:LogisticCompanyId"`
-		WaybillNumber     string                   `json:"waybillNumber" gorm:"type:varchar(255);comment:杩愬崟鍙�"`    //杩愬崟鍙�
-		Weight            decimal.Decimal          `gorm:"type:decimal(20,2);comment:閲嶉噺" json:"weight"`           //閲嶉噺
-		LogisticWeight    decimal.Decimal          `gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺" json:"logisticWeight"` //鐗╂祦閲嶉噺
-		Source            string                   `json:"source" gorm:"type:varchar(255);comment:鏉ユ簮绯荤粺,鐢ㄤ簬杩斿洖淇敼鐘舵��"`
+		Number            string                   `json:"number" gorm:"type:varchar(255);comment:鍗曞彿"`                             //鍗曞彿
+		SourceNumber      string                   `json:"sourceNumber" gorm:"index;type:varchar(255);comment:婧愬崟鍙�"`                //婧愬崟鍙�
+		OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"`                //浣滀笟绫诲瀷id
+		OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:浣滀笟绫诲瀷鍚嶇О"`              //浣滀笟绫诲瀷鍚嶇О
+		Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"`                         //鐘舵��
+		OperationDate     string                   `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`                     // 瀹夋帓鏃ユ湡
+		ContacterID       int                      `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`                              // 鑱旂郴浜篒D
+		ContacterName     string                   `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`                    // 鑱旂郴浜哄鍚�
+		CompanyID         string                   `json:"companyID" gorm:"type:varchar(255);comment:鍏徃ID-瀹㈡埛"`                     // 鍏徃ID-瀹㈡埛
+		CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`                   // 鍏徃鍚嶇О-瀹㈡埛
+		Comment           string                   `json:"comment" gorm:"type:text;comment:澶囨敞"`                                    // 澶囨敞
+		LogisticCompanyId string                   `json:"logisticCompanyId" gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`              // 鐗╂祦鍏徃id
+		LogisticCompany   LogisticCompany          `json:"logisticCompany" gorm:"foreignKey:LogisticCompanyId"`                    // 鐗╂祦鍏徃淇℃伅
+		WaybillNumber     string                   `json:"waybillNumber" gorm:"type:varchar(255);comment:杩愬崟鍙�"`                     //杩愬崟鍙�
+		Weight            decimal.Decimal          `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺" `                           //閲嶉噺
+		LogisticWeight    decimal.Decimal          `json:"logisticWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺" `                 //鐗╂祦閲嶉噺
+		Source            string                   `json:"source" gorm:"type:varchar(255);comment:鏉ユ簮绯荤粺,鐢ㄤ簬杩斿洖淇敼鐘舵��"`                  // 鏉ユ簮绯荤粺
 		OperationSource   constvar.OperationSource `json:"operationSource" gorm:"type:tinyint(3);not null;default:0;comment:鎿嶄綔鏉ユ簮"` //鎿嶄綔鏉ユ簮
 
-		Details           []*OperationDetails        `json:"details" gorm:"foreignKey:OperationID;references:Id"`
+		Details           []*OperationDetails        `json:"details" gorm:"foreignKey:OperationID;references:Id"`           // 鎿嶄綔鏄庣粏
 		BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
 
-		AuditDate     string `json:"auditDate" gorm:"type:varchar(31);comment:瀹℃壒鏃堕棿"`
-		ReceiverName  string `json:"receiverName" gorm:"type:varchar(31);comment:鏀惰揣浜哄鍚�"`
-		ReceiverPhone string `json:"receiverPhone" gorm:"type:varchar(31);comment:鑱旂郴鐢佃瘽"`
-		ReceiverAddr  string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"`
+		AuditDate     string `json:"auditDate" gorm:"type:varchar(31);comment:瀹℃壒鏃堕棿"`     // 瀹℃壒鏃堕棿
+		ReceiverName  string `json:"receiverName" gorm:"type:varchar(31);comment:鏀惰揣浜哄鍚�"` // 鏀惰揣浜哄鍚�
+		ReceiverPhone string `json:"receiverPhone" gorm:"type:varchar(31);comment:鑱旂郴鐢佃瘽"` // 鑱旂郴鐢佃瘽
+		ReceiverAddr  string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"` // 鏀惰揣鍦板潃
 
-		LocationID         int      `json:"locationID"   gorm:"type:int;not null;comment:婧愪綅缃甶d"`          //婧愪綅缃甶d
-		Location           Location `json:"location" gorm:"foreignkey:LocationID;references:Id"`          //婧愪綅缃�
-		ToLocationID       int      `json:"toLocationId"    gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"`      //鐩爣浣嶇疆id
-		ToLocation         Location `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
-		SalesDetailsNumber string   `gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�" json:"salesDetailsNumber"`
+		LocationID         int      `json:"locationID" gorm:"type:int;not null;comment:婧愪綅缃甶d"`          //婧愪綅缃甶d
+		Location           Location `json:"location" gorm:"foreignkey:LocationID;references:Id"`        //婧愪綅缃�
+		ToLocationID       int      `json:"toLocationId" gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"`       //鐩爣浣嶇疆id
+		ToLocation         Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"`    //鐩爣浣嶇疆
+		SalesDetailsNumber string   `json:"salesDetailsNumber" gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�"` // 閿�鍞槑缁嗙紪鐮�
 
-		ManagerId    string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
-		Manager      string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
-		AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
-		Accountant   string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
-		CustodianId  string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`
-		Custodian    string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
-		CreatedBy    string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`
-		CheckedBy    string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
-		Remark       string `json:"remark"`
+		ManagerId    string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`      // 涓荤id
+		Manager      string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`        // 涓荤鍚嶇О
+		AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`   // 浼氳id
+		Accountant   string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`     // 浼氳鍚嶇О
+		CustodianId  string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`   // 淇濈鍛榠d
+		Custodian    string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`     // 淇濈鍛樺悕绉�
+		CreatedBy    string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`  // 鍒涘缓鑰匲serId
+		CheckedBy    string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"` // 楠岃瘉鑰匲serId
+		Remark       string `json:"remark"`                                               // 澶囨敞
 
-		WarehouseId      int       `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"`
-		Warehouse        Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"`
-		IsInternalOutput bool      `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
-		DealerType       string    `json:"dealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撶被鍨�"`
+		WarehouseId      int       `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"` // 浠撳簱id
+		Warehouse        Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"`                     // 浠撳簱淇℃伅
+		IsInternalOutput bool      `json:"isInternalOutput" gorm:"type:tinyint(1);comment:鏄惁璋冩嫧浜х敓鐨勫嚭搴�"`   //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+		DealerType       string    `json:"dealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撶被鍨�"`         // 璋冩嫧鍑哄叆搴撶被鍨�
+
+		// 鍢夎仈浠撳偍娣诲姞 SilkMarket
+		SilkMarket string `json:"silkMarket" gorm:"type:varchar(255);comment:搴勫彛"` // 搴勫彛
 	}
 
 	OperationSearch struct {

--
Gitblit v1.8.0