From b28a7f52e8df5889572f86a9422c62c10334f70c Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 25 九月 2023 10:17:49 +0800
Subject: [PATCH] 1.修改出入库模块的新增、修改、列表，operation_details不再保存产品名称和单位，改为读取material 2.修改报废模块的新增，修改、列表，不再使用productName和unit字段
---
models/operation.go | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 3142f3b..7f17d4a 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -45,6 +45,7 @@
Keyword string
Orm *gorm.DB
Preload bool
+ Disuse bool
}
)
@@ -101,6 +102,11 @@
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{})
@@ -128,7 +134,11 @@
}
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