From f3b1ba6c5d2f8f479b41e4e36093322d383b4e9c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 19:32:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation.go | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 76b7797..6b31864 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -2,7 +2,6 @@
import (
"fmt"
- "github.com/shopspring/decimal"
"gorm.io/gorm"
"wms/constvar"
"wms/pkg/mysqlx"
@@ -22,16 +21,19 @@
ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationId"` //鐩爣浣嶇疆
OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
- CarrierID int `json:"carrierID" gorm:"type:int;comment:鎵胯繍鍟咺D"`
- CarrierName string `json:"carrierName" gorm:"type:varchar(63);comment:鎵胯繍鍟嗗悕绉�"`
- Tracking string `json:"tracking" gorm:"type:varchar(127);comment:杩借釜鍙傝��"`
ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
- Weight decimal.Decimal `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺(kg)"`
- TransferWeight decimal.Decimal `json:"transferWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺(kg)"`
- CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID"`
- CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О(kg)"`
- Details []*OperationDetails `json:"details"`
+ CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID-瀹㈡埛"`
+ CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
+ Comment string `json:"comment" gorm:"type:text;comment:澶囨敞"`
+
+ Details []*OperationDetails `json:"details"`
+
+ //Weight decimal.Decimal `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺(kg)"`
+ //TransferWeight decimal.Decimal `json:"transferWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺(kg)"`
+ //CarrierID int `json:"carrierID" gorm:"type:int;comment:鎵胯繍鍟咺D"`
+ //CarrierName string `json:"carrierName" gorm:"type:varchar(63);comment:鎵胯繍鍟嗗悕绉�"`
+ //Tracking string `json:"tracking" gorm:"type:varchar(127);comment:杩借釜鍙傝��"`
}
OperationSearch struct {
@@ -73,10 +75,10 @@
return slf
}
-//func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
-// slf.Keyword = keyword
-// return slf
-//}
+func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
+ slf.Keyword = keyword
+ return slf
+}
func (slf *OperationSearch) SetOperationTypeId(operationTypeId int) *OperationSearch {
slf.OperationTypeId = operationTypeId
--
Gitblit v1.8.0