From 839de9fbaac98f3a4a5b9db413df94ba7ba459fd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 18 七月 2024 10:24:46 +0800
Subject: [PATCH] 修改方法，去除庄口获取庄口列表方法；修复BUG
---
/dev/null | 289 ---------------------------------------------------------
models/mini_dict.go | 2
2 files changed, 1 insertions(+), 290 deletions(-)
diff --git a/models/mini_dict.go b/models/mini_dict.go
index 46670e8..37ecdb2 100644
--- a/models/mini_dict.go
+++ b/models/mini_dict.go
@@ -270,7 +270,7 @@
db = slf.build()
)
- err := db.Select("COUNT(id) as max").Scan(&result).Error
+ err := db.Select("Max(id) as max").Scan(&result).Error
if err != nil {
return result.Max, fmt.Errorf("max err: %v", err)
}
diff --git a/models/silk_dict.go b/models/silk_dict.go
deleted file mode 100644
index 21659a7..0000000
--- a/models/silk_dict.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package models
-
-import (
- "fmt"
- "gorm.io/gorm"
- "wms/pkg/mysqlx"
-)
-
-type SilkDictType int
-
-const (
- DictTypeMarket SilkDictType = iota + 1 //搴勫彛
- DictTypeWorkshop //杞﹂棿
- DictTypeColor //棰滆壊
- DictTypeSpec //瑙勬牸
-)
-
-type (
- // SilkDict 缂笣璇嶅吀
- SilkDict struct {
- gorm.Model
- DictType SilkDictType `gorm:"index;type:tinyint(3);not null;comment:瀛楀吀绫诲瀷"` //瀛楀吀绫诲瀷
- Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
- Name string `gorm:"type:varchar(255);not null;comment:鍚嶇О" json:"name"` //鍚嶇О
- Remark string `gorm:"type:varchar(255);not null;comment:澶囨敞" json:"remark"` //澶囨敞
- }
-
- SilkDictSearch struct {
- SilkDict
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
- Keyword string
- DictTypes []SilkDictType
- }
-)
-
-func (slf *SilkDict) TableName() string {
- return "silk_dict"
-}
-
-func NewSilkDictSearch() *SilkDictSearch {
- return &SilkDictSearch{Orm: mysqlx.GetDB()}
-}
-
-func (slf *SilkDictSearch) SetOrm(tx *gorm.DB) *SilkDictSearch {
- slf.Orm = tx
- return slf
-}
-
-func (slf *SilkDictSearch) SetPage(page, size int) *SilkDictSearch {
- slf.PageNum, slf.PageSize = page, size
- return slf
-}
-
-func (slf *SilkDictSearch) SetOrder(order string) *SilkDictSearch {
- slf.Order = order
- return slf
-}
-
-func (slf *SilkDictSearch) SetID(id uint) *SilkDictSearch {
- slf.ID = id
- return slf
-}
-
-func (slf *SilkDictSearch) SetNumber(number string) *SilkDictSearch {
- slf.Number = number
- return slf
-}
-
-func (slf *SilkDictSearch) SetName(name string) *SilkDictSearch {
- slf.Name = name
- return slf
-}
-
-func (slf *SilkDictSearch) SetKeyword(keyword string) *SilkDictSearch {
- slf.Keyword = keyword
- return slf
-}
-
-func (slf *SilkDictSearch) SetDictType(dt SilkDictType) *SilkDictSearch {
- slf.DictType = dt
- return slf
-}
-
-func (slf *SilkDictSearch) SetDictTypes(dts []SilkDictType) *SilkDictSearch {
- slf.DictTypes = dts
- return slf
-}
-
-func (slf *SilkDictSearch) build() *gorm.DB {
- var db = slf.Orm.Table(slf.TableName())
-
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
- }
-
- if slf.Order != "" {
- db = db.Order(slf.Order)
- }
-
- if slf.Number != "" {
- db = db.Where("number = ?", slf.Number)
- }
-
- if slf.DictType > 0 {
- db = db.Where("dict_type = ?", slf.DictType)
- }
-
- if slf.Name != "" {
- db = db.Where("name = ?", slf.Name)
- }
-
- if slf.Keyword != "" {
- kw := "%" + slf.Keyword + "%"
- db = db.Where("name like ? or number like ?", kw, kw)
- }
-
- if len(slf.DictTypes) > 0 {
- db = db.Where("dict_type in (?)", slf.DictTypes)
- }
-
- return db
-}
-
-// Create 鍗曟潯鎻掑叆
-func (slf *SilkDictSearch) Create(record *SilkDict) error {
- var db = slf.build()
-
- if err := db.Create(record).Error; err != nil {
- return fmt.Errorf("create err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-// CreateBatch 鎵归噺鎻掑叆
-func (slf *SilkDictSearch) CreateBatch(records []*SilkDict) error {
- var db = slf.build()
-
- if err := db.Create(&records).Error; err != nil {
- return fmt.Errorf("create batch err: %v, records: %+v", err, records)
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) Save(record *SilkDict) error {
- var db = slf.build()
-
- if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
- return fmt.Errorf("save err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) Update(record *SilkDict) error {
- var db = slf.build()
-
- if err := db.Updates(record).Error; err != nil {
- return fmt.Errorf("save err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) UpdateByMap(upMap map[string]interface{}) error {
- var (
- db = slf.build()
- )
-
- if err := db.Updates(upMap).Error; err != nil {
- return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
- var (
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if err := db.Updates(upMap).Error; err != nil {
- return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) Delete() error {
- var db = slf.build()
-
- if err := db.Unscoped().Delete(&SilkDict{}).Error; err != nil {
- return err
- }
-
- return nil
-}
-
-func (slf *SilkDictSearch) First() (*SilkDict, error) {
- var (
- record = new(SilkDict)
- db = slf.build()
- )
-
- if err := db.First(record).Error; err != nil {
- return record, err
- }
-
- return record, nil
-}
-
-func (slf *SilkDictSearch) Find() ([]*SilkDict, int64, error) {
- var (
- records = make([]*SilkDict, 0)
- total int64
- db = slf.build()
- )
-
- if err := db.Count(&total).Error; err != nil {
- return records, total, fmt.Errorf("find count err: %v", err)
- }
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, total, fmt.Errorf("find records err: %v", err)
- }
-
- return records, total, nil
-}
-
-func (slf *SilkDictSearch) FindAll() ([]*SilkDict, error) {
- var (
- records = make([]*SilkDict, 0)
- db = slf.build()
- )
- if err := db.Find(&records).Error; err != nil {
- return records, fmt.Errorf("find records err: %v", err)
- }
-
- return records, nil
-}
-
-// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
-func (slf *SilkDictSearch) FindByQuery(query string, args []interface{}) ([]*SilkDict, int64, error) {
- var (
- records = make([]*SilkDict, 0)
- total int64
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if err := db.Count(&total).Error; err != nil {
- return records, total, fmt.Errorf("find by query count err: %v", err)
- }
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
- }
-
- return records, total, nil
-}
-
-// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
-func (slf *SilkDictSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*SilkDict, error) {
- var (
- records = make([]*SilkDict, 0)
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
- }
-
- return records, nil
-}
-
-// InitDefaultData 鍒濆鍖栨暟鎹�
-func (slf *SilkDictSearch) InitDefaultData() error {
- return nil
-}
--
Gitblit v1.8.0