From 07079a17b93d1dc2f06d73a5a08f6ba63a87d9a3 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 10 十一月 2023 10:51:32 +0800
Subject: [PATCH] 出入库操作添加物流信息

---
 request/operation.go |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/request/operation.go b/request/operation.go
index ba5b594..966c299 100644
--- a/request/operation.go
+++ b/request/operation.go
@@ -21,12 +21,10 @@
 	CompanyID         int                      `json:"companyID" gorm:"type:int;comment:鍏徃ID"`              //鍏徃ID-瀹㈡埛
 	CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О"`   //鍏徃鍚嶇О-瀹㈡埛鍚嶇О
 	Comment           string                   `json:"comment" gorm:"type:text;comment:澶囨敞"`                 //澶囨敞
-
-	//Weight          decimal.Decimal          `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺(kg)"`           //閲嶉噺(kg)-闈炲繀濉�
-	//TransferWeight  decimal.Decimal          `json:"transferWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺(kg)"` //鐗╂祦閲嶉噺(kg)-闈炲繀濉�
-	//CarrierID       int                      `json:"carrierID" gorm:"type:int;comment:鎵胯繍鍟咺D"`                   //鎵胯繍鍟咺D-闈炲繀濉�
-	//CarrierName     string                   `json:"carrierName" gorm:"type:varchar(63);comment:鎵胯繍鍟嗗悕绉�"`         //鎵胯繍鍟嗗悕绉�-闈炲繀濉�
-	//Tracking        string                   `json:"tracking" gorm:"type:varchar(127);comment:杩借釜鍙傝��"`            //杩借釜鍙傝��-闈炲繀濉�
+	LogisticCompanyId string                   `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
+	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"` //鐗╂祦閲嶉噺
 }
 
 type OperationDetails struct {
@@ -62,6 +60,10 @@
 	CompanyName       string                     `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О"`   //鍏徃鍚嶇О-瀹㈡埛鍚嶇О
 	Comment           string                     `json:"comment" gorm:"type:text;comment:澶囨敞"`                 //澶囨敞
 	BaseOperationType constvar.BaseOperationType `json:"baseOperationType"`                                   //鍩虹浣滀笟绫诲瀷
+	LogisticCompanyId string                     `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
+	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"` //鐗╂祦閲嶉噺
 }
 
 type OperationAllList struct {

--
Gitblit v1.8.0