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.go | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index a3ab05e..9e2846c 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -59,25 +59,31 @@
Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
CreatedBy string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`
CheckedBy string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
+ Remark string `json:"remark"`
- IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
+ Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"`
+ IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+ 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 //
}
)
@@ -87,6 +93,12 @@
func NewOperationSearch() *OperationSearch {
return &OperationSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *OperationSearch) BeforeCreate(tx *gorm.DB) {
+ for k := range slf.Details {
+ slf.Details[k].BaseOperationType = slf.BaseOperationType
+ }
}
func (slf *OperationSearch) SetOrm(tx *gorm.DB) *OperationSearch {
@@ -185,6 +197,16 @@
return slf
}
+func (slf *OperationSearch) SetInventoryDealerTypeIds(inventoryDealerTypeArr []int) *OperationSearch {
+ slf.InventoryDealerTypeIds = inventoryDealerTypeArr
+ return slf
+}
+
+func (slf *OperationSearch) SetWarehouseId(warehouseId int) *OperationSearch {
+ slf.WarehouseId = warehouseId
+ return slf
+}
+
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
@@ -216,7 +238,14 @@
}
if slf.Preload {
- db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation")
+ db = db.Model(&Operation{}).Preload("Details").
+ Preload("Details.Product").
+ Preload("LogisticCompany").
+ Preload("Location").
+ Preload("ToLocation").
+ Preload("Details.FromLocation").
+ Preload("Details.ToLocation").
+ Preload("InventoryDealer").Preload("Warehouse")
}
if slf.Disuse {
@@ -254,6 +283,15 @@
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)
+ }
+
+ if slf.WarehouseId != 0 {
+ db = db.Where("warehouse_id = ?", slf.WarehouseId)
+ }
+
return db
}
--
Gitblit v1.8.0