From 1691d8ee8fe10799d98b296625fd30183407ef25 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 28 六月 2024 12:17:22 +0800
Subject: [PATCH] 新增操作类型增加基础操作类型和仓库id来支持库存盘点

---
 request/operation.go |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/request/operation.go b/request/operation.go
index bc4942e..a68aa72 100644
--- a/request/operation.go
+++ b/request/operation.go
@@ -14,28 +14,30 @@
 	Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"`            //鐘舵��
 	//FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:婧愪綅缃甶d"`   //婧愪綅缃甶d
 	//ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:鐩爣浣嶇疆id"`   //鐩爣浣嶇疆id
-	OperationDate     string              `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"` //瀹夋帓鏃ユ湡
-	Details           []*OperationDetails `json:"details"`
-	ContacterID       int                 `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`           //鑱旂郴浜篒D-闈炲繀濉�
-	ContacterName     string              `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"` //鑱旂郴浜哄鍚�-闈炲繀濉�
-	CompanyID         string              `json:"companyID"`                                           //鍏徃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"`
-	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"` //鐗╂祦閲嶉噺
-	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
-	ToLocationId      int                 `json:"toLocationId"    gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id
-	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:淇濈鍛樺悕绉�"`
+	OperationDate     string                     `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"` //瀹夋帓鏃ユ湡
+	Details           []*OperationDetails        `json:"details"`
+	ContacterID       int                        `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`           //鑱旂郴浜篒D-闈炲繀濉�
+	ContacterName     string                     `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"` //鑱旂郴浜哄鍚�-闈炲繀濉�
+	CompanyID         string                     `json:"companyID"`                                           //鍏徃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"`
+	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"` //鐗╂祦閲嶉噺
+	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
+	ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id
+	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:淇濈鍛樺悕绉�"`
+	BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣
+	WarehouseId       int                        `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`             //浠撳簱id
 }
 
 type OperationDetails struct {
@@ -59,9 +61,10 @@
 
 type OperationList struct {
 	PageInfo
-	OperationTypeId int                      `json:"operationTypeId" form:"operationTypeId"`
-	Number          string                   `json:"number"`
-	Status          constvar.OperationStatus `json:"status"`
+	OperationTypeId   int                        `json:"operationTypeId" form:"operationTypeId"`
+	BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` // 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
+	Number            string                     `json:"number"`
+	Status            constvar.OperationStatus   `json:"status"`
 }
 
 type UpdateOperation struct {

--
Gitblit v1.8.0