From 23663116574fa8f977c1241f98347833a2c28087 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 29 六月 2024 18:27:48 +0800
Subject: [PATCH] 仓库盘点bug修改
---
models/operation.go | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 9caeb40..36b2391 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -63,25 +63,26 @@
WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
- InventoryDealerType int `json:"inventoryDealerType" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
+ InventoryDealerType int `json:"inventoryDealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)"`
InventoryDealer MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
}
OperationSearch struct {
Operation
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
- Disuse bool
- Ids []int
- SourceNumbers []string
- SalesDetailsNumbers []string
- Fields string
- BeginTime time.Time
- EndTime time.Time
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ Disuse bool
+ Ids []int
+ SourceNumbers []string
+ SalesDetailsNumbers []string
+ Fields string
+ BeginTime time.Time
+ EndTime time.Time
+ InventoryDealerTypeIds []int //
}
)
@@ -189,6 +190,11 @@
return slf
}
+func (slf *OperationSearch) SetInventoryDealerTypeIds(inventoryDealerTypeArr []int) *OperationSearch {
+ slf.InventoryDealerTypeIds = inventoryDealerTypeArr
+ return slf
+}
+
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
@@ -258,6 +264,11 @@
if !slf.BeginTime.IsZero() && !slf.EndTime.IsZero() {
db = db.Where("created_at between ? and ?", slf.BeginTime, slf.EndTime)
}
+
+ if len(slf.InventoryDealerTypeIds) > 0 {
+ db = db.Where("inventory_dealer_type in (?)", slf.InventoryDealerTypeIds)
+ }
+
return db
}
--
Gitblit v1.8.0