From 541486c20ad74c2bcbb2e42137a116981b313787 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 25 九月 2023 10:18:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation.go | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index d1c7545..7f17d4a 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -45,6 +45,7 @@
Keyword string
Orm *gorm.DB
Preload bool
+ Disuse bool
}
)
@@ -91,6 +92,21 @@
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{})
@@ -101,16 +117,28 @@
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("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("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)
}
return db
--
Gitblit v1.8.0