From e598e4d2718c41352eafae19284ffe358b8c8181 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期三, 17 七月 2024 18:18:19 +0800
Subject: [PATCH] 修改方法，去除庄口获取庄口列表方法；添加产品来源字典类型；添加字典模糊搜索
---
models/mini_dict.go | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/models/mini_dict.go b/models/mini_dict.go
index 37813c8..46670e8 100644
--- a/models/mini_dict.go
+++ b/models/mini_dict.go
@@ -20,6 +20,7 @@
MiniDictSearch struct {
MiniDict
+ Keyword string
Order string
PageNum int
PageSize int
@@ -70,6 +71,11 @@
return slf
}
+func (slf *MiniDictSearch) SetKeyword(keyword string) *MiniDictSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
func (slf *MiniDictSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -87,6 +93,10 @@
if slf.Value != "" {
db = db.Where("value = ?", slf.Value)
+ }
+
+ if slf.Keyword != "" {
+ db = db.Where("name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
}
db.Where("1 = 1")
@@ -250,6 +260,23 @@
return records, nil
}
+func (slf *MiniDictSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("COUNT(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
+
// InitDefaultData 鍒濆鍖栨暟鎹�
func (slf *MiniDictSearch) InitDefaultData() error {
var (
@@ -263,14 +290,16 @@
return nil
}
dict := make([]*MiniDict, 0)
- dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "鍐呴儴璋冩嫧", Value: "1"})
- dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "澶栭儴璋冩嫧", Value: "2"})
- dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "閲囪喘", Value: "1"})
+ dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "閲囪喘", Value: "1", IsDefault: true})
dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "鍏朵粬", Value: "99"})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "灞曞巺", Value: "1"})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "缁忛攢鍟�", Value: "2"})
- dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "閫�搴�", Value: "9"})
+ dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "閫�搴�", Value: "9", IsDefault: true})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "鍏朵粬", Value: "99"})
+ dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "鍐呴儴璋冩嫧", Value: "1", IsDefault: true})
+ dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "澶栭儴璋冩嫧", Value: "2"})
+ dict = append(dict, &MiniDict{Type: constvar.TakeStockType, Name: "鍏朵粬", Value: "99"})
+ dict = append(dict, &MiniDict{Type: constvar.DisuseType, Name: "鍏朵粬", Value: "99"})
err := slf.CreateBatch(dict)
return err
}
--
Gitblit v1.8.0