From b9a62531fb93aba42d13e62fd1b03d8dba112fa6 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 23 十月 2023 12:04:31 +0800
Subject: [PATCH] 位置修改
---
models/operation.go | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index d1c7545..faa78a2 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -28,13 +28,8 @@
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"`
-
- //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:杩借釜鍙傝��"`
+ Details []*OperationDetails `json:"details" gorm:"foreignKey:OperationID;references:Id"`
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
}
OperationSearch struct {
@@ -45,6 +40,8 @@
Keyword string
Orm *gorm.DB
Preload bool
+ Disuse bool
+ Ids []int
}
)
@@ -91,6 +88,36 @@
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) SetIds(ids []int) *OperationSearch {
+ slf.Ids = ids
+ return slf
+}
+
+func (slf *OperationSearch) SetStatus(status constvar.OperationStatus) *OperationSearch {
+ slf.Status = status
+ return slf
+}
+
+func (slf *OperationSearch) SetBaseOperationType(baseOperationType constvar.BaseOperationType) *OperationSearch {
+ slf.BaseOperationType = baseOperationType
+ return slf
+}
+
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
@@ -101,16 +128,40 @@
db = db.Order(slf.Order)
}
- //if slf.Keyword != "" {
- // db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
- //}
+ if slf.Keyword != "" {
+ db = db.Where("number like ? or source_number like ?", fmt.Sprintf("%%%v%%", slf.Keyword), 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("FromLocation").Preload("ToLocation")
+ db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").Preload("ToLocation")
+ }
+
+ if slf.Disuse {
+ db = db.Where("operation_type_id = ?", 0)
+ }
+
+ if len(slf.Ids) > 0 {
+ db = db.Where("id in (?)", slf.Ids)
+ }
+
+ if slf.Status > 0 {
+ db = db.Where("status = ?", slf.Status)
+ }
+
+ if slf.BaseOperationType != 0 {
+ db = db.Where("base_operation_type = ?", slf.BaseOperationType)
}
return db
@@ -213,7 +264,7 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
- if err := db.Find(&records).Error; err != nil {
+ if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
}
@@ -229,7 +280,7 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
- if err := db.Find(&records).Error; err != nil {
+ if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
return records, fmt.Errorf("find records err: %v", err)
}
--
Gitblit v1.8.0