From 91d7ca06128f996844aa7d2d691d083c944bdf1d Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期三, 03 七月 2024 17:22:16 +0800
Subject: [PATCH] 导入物料/产品->新模版BUG修复
---
models/operation_type.go | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/models/operation_type.go b/models/operation_type.go
index 4857259..25af9ff 100644
--- a/models/operation_type.go
+++ b/models/operation_type.go
@@ -36,17 +36,18 @@
ReturnOperationType string `json:"returnOperationType" gorm:"-"` //閫�璐х被鍨嬪悕绉�
ReadyCount int `json:"readyCount" gorm:"-"` //灏辩华鏁伴噺
FinishCount int `json:"finishCount" gorm:"-"` //瀹屾垚鏁伴噺
- CancelCount int `json:"cancelCount" gorm:"-"` //鍙栨秷鏁伴噺
+ CancelCount int `json:"cancelCount" gorm:"-"` //鍙栨秷1鏁伴噺
}
OperationTypeSearch struct {
OperationType
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ WarehouseIds []int
}
OperationTypeByStatus struct {
@@ -109,6 +110,11 @@
return slf
}
+func (slf *OperationTypeSearch) SetWarehouseIds(warehouseIds []int) *OperationTypeSearch {
+ slf.WarehouseIds = warehouseIds
+ return slf
+}
+
func (slf *OperationTypeSearch) build() *gorm.DB {
var db = slf.Orm.Model(&OperationType{})
@@ -136,6 +142,10 @@
db = db.Where("warehouse_id = ?", slf.WarehouseId)
}
+ if len(slf.WarehouseIds) > 0 {
+ db = db.Where("warehouse_id in ?", slf.WarehouseIds)
+ }
+
if int(slf.BaseOperationType) != 0 {
db = db.Where("base_operation_type = ?", slf.BaseOperationType)
}
--
Gitblit v1.8.0