From 65f900c88f0f90ee3b29e9b985723b8f94aaeb0b Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 27 九月 2023 14:14:35 +0800
Subject: [PATCH] 1.修改上架规则列表bug
---
models/operation.go | 102 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 450bd27..5f20228 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -4,7 +4,6 @@
"fmt"
"gorm.io/gorm"
"wms/constvar"
- "wms/extend/util"
"wms/pkg/mysqlx"
)
@@ -12,26 +11,25 @@
// Operation 鎿嶄綔琛�
Operation struct {
WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Number string `json:"number" gorm:"column:number;type:varchar(255)"` //鍗曞彿
- SourceNumber string `json:"sourceNumber" gorm:"type:varchar(255)"` //婧愬崟鍙�
- OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"` //浣滀笟绫诲瀷id
- Status constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"` //鐘舵��
- FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
- FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationId"` //婧愪綅缃�
- ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
- ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationId"` //鐩爣浣嶇疆
- OperationDate util.JSONTime `json:"operationDate" gorm:"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 float64 `json:"weight" gorm:"type:decimal;comment:閲嶉噺(kg)"`
- TransferWeight float64 `json:"transferWeight" gorm:"type:decimal;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"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Number string `json:"number" gorm:"type:varchar(255)"` //鍗曞彿
+ SourceNumber string `json:"sourceNumber" gorm:"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:鐘舵��"` //鐘舵��
+ FromLocationID int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
+ FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationID;references:Id"` //婧愪綅缃�
+ ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
+ ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
+ 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 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" gorm:"foreignKey:OperationID;references:Id"`
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
}
OperationSearch struct {
@@ -42,11 +40,12 @@
Keyword string
Orm *gorm.DB
Preload bool
+ Disuse bool
}
)
func (slf *Operation) TableName() string {
- return "operation"
+ return "wms_operation"
}
func NewOperationSearch() *OperationSearch {
@@ -68,8 +67,8 @@
return slf
}
-func (slf *OperationSearch) SetID(id uint) *OperationSearch {
- slf.ID = id
+func (slf *OperationSearch) SetID(ID int) *OperationSearch {
+ slf.Id = ID
return slf
}
@@ -78,24 +77,63 @@
return slf
}
+func (slf *OperationSearch) SetOperationTypeId(operationTypeId int) *OperationSearch {
+ slf.OperationTypeId = operationTypeId
+ return slf
+}
+
func (slf *OperationSearch) SetPreload(preload bool) *OperationSearch {
slf.Preload = preload
+ return slf
+}
+
+func (slf *OperationSearch) SetNumber(number string) *OperationSearch {
+ slf.Number = number
+ return slf
+}
+
+func (slf *OperationSearch) SetSourceNumber(sourceNumber string) *OperationSearch {
+ slf.SourceNumber = sourceNumber
+ return slf
+}
+
+func (slf *OperationSearch) SetDisuse(disuse bool) *OperationSearch {
+ slf.Disuse = disuse
return slf
}
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
+ if slf.Id != 0 {
+ db = db.Where("id = ?", slf.Id)
}
-
if slf.Order != "" {
db = db.Order(slf.Order)
}
if slf.Keyword != "" {
db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ }
+
+ if slf.SourceNumber != "" {
+ db = db.Where("source_number like ?", fmt.Sprintf("%%%v%%", slf.SourceNumber))
+ }
+
+ if slf.Number != "" {
+ db = db.Where("number like ?", fmt.Sprintf("%%%v%%", slf.Number))
+ }
+
+ if slf.OperationTypeId != 0 {
+ db.Where("operation_type_id = ?", slf.OperationTypeId)
+ }
+
+ if slf.Preload {
+ db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").Preload("ToLocation")
+ }
+
+ if slf.Disuse {
+ db = db.Where("operation_type_id = ?", 0)
}
return db
@@ -123,6 +161,16 @@
return nil
}
+func (slf *OperationSearch) Save(record *Operation) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
func (slf *OperationSearch) Update(record *Operation) error {
var db = slf.build()
--
Gitblit v1.8.0