调拨、入库、出库按类型配置字典类(1 调拨 2 入库 3 出库)
| | |
| | | const ( |
| | | SystemConfigTypeInventoryCutOffPoint SystemConfigType = 1 //库存结算时间点 |
| | | ) |
| | | |
| | | type MiniDictType int |
| | | |
| | | const ( |
| | | TransferType MiniDictType = iota + 1 // 调拨类型 |
| | | StorageType // 入库类型 |
| | | StockoutType // 出库类型 |
| | | ) |
| | | |
| | | func (t MiniDictType) Valid() bool { |
| | | if t <= 0 { |
| | | return false |
| | | } |
| | | return true |
| | | } |
New file |
| | |
| | | package controllers |
| | | |
| | | import ( |
| | | "github.com/gin-gonic/gin" |
| | | "gorm.io/gorm" |
| | | "strconv" |
| | | "wms/extend/code" |
| | | "wms/extend/util" |
| | | "wms/models" |
| | | "wms/pkg/logx" |
| | | "wms/request" |
| | | ) |
| | | |
| | | type DictController struct{} |
| | | |
| | | // AddMiniDict |
| | | // |
| | | // @Tags 数据字典 |
| | | // @Summary 添加迷你字典 |
| | | // @Produce application/json |
| | | // @Param object body request.AddMiniDict true "参数" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-wms/v1/dict/add [post] |
| | | func (slf DictController) AddMiniDict(c *gin.Context) { |
| | | var params request.AddMiniDict |
| | | if err := c.BindJSON(¶ms); err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | |
| | | if !params.Type.Valid() { |
| | | util.ResponseFormat(c, code.RequestParamError, "字典类型错误") |
| | | return |
| | | } |
| | | |
| | | if len(params.Name) == 0 { |
| | | util.ResponseFormat(c, code.RequestParamError, "名称为空") |
| | | return |
| | | } |
| | | |
| | | record := models.MiniDict{ |
| | | Type: params.Type, |
| | | Name: params.Name, |
| | | Value: params.Value, |
| | | IsDefault: params.IsDefault, |
| | | } |
| | | |
| | | if err := models.NewMiniDictSearch().Create(&record); err != nil { |
| | | logx.Errorf("MiniDict add err: %v", err) |
| | | util.ResponseFormat(c, code.RequestParamError, "添加失败") |
| | | return |
| | | } |
| | | util.ResponseFormat(c, code.Success, "添加成功") |
| | | } |
| | | |
| | | // EditMiniDict |
| | | // |
| | | // @Tags 数据字典 |
| | | // @Summary 编辑迷你字典 |
| | | // @Produce application/json |
| | | // @Param object body request.EditMiniDict true "参数" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-wms/v1/dict/edit [post] |
| | | func (slf DictController) EditMiniDict(c *gin.Context) { |
| | | var params request.EditMiniDict |
| | | if err := c.BindJSON(¶ms); err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | |
| | | if params.ID == 0 { |
| | | util.ResponseFormat(c, code.RequestParamError, "无效ID") |
| | | return |
| | | } |
| | | |
| | | if !params.Type.Valid() { |
| | | util.ResponseFormat(c, code.RequestParamError, "字典类型错误") |
| | | return |
| | | } |
| | | |
| | | if len(params.Name) == 0 { |
| | | util.ResponseFormat(c, code.RequestParamError, "名称为空") |
| | | return |
| | | } |
| | | |
| | | record := models.MiniDict{ |
| | | Name: params.Name, |
| | | Value: params.Value, |
| | | IsDefault: params.IsDefault, |
| | | } |
| | | record.ID = uint(params.ID) |
| | | |
| | | if err := models.NewMiniDictSearch().SetID(uint(params.ID)).Save(&record); err != nil { |
| | | logx.Errorf("MiniDict edit err: %v", err) |
| | | util.ResponseFormat(c, code.RequestParamError, "编辑失败") |
| | | return |
| | | } |
| | | util.ResponseFormat(c, code.Success, "编辑成功") |
| | | } |
| | | |
| | | // DeleteMiniDict |
| | | // |
| | | // @Tags 属性值和对象 |
| | | // @Summary 删除属性值和对象 |
| | | // @Param id path string true "id" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-wms/v1/dict/delete/{id} [delete] |
| | | func (slf DictController) DeleteMiniDict(c *gin.Context) { |
| | | id, _ := strconv.ParseUint(c.Param("id"), 10, 64) |
| | | if id == 0 { |
| | | util.ResponseFormat(c, code.RequestParamError, "无效ID") |
| | | return |
| | | } |
| | | err := models.NewMiniDictSearch().SetID(uint(id)).Delete() |
| | | if err != nil { |
| | | logx.Errorf("MiniDict delete err: %v", err) |
| | | util.ResponseFormat(c, code.RequestParamError, "删除失败") |
| | | return |
| | | } |
| | | util.ResponseFormat(c, code.Success, "删除成功") |
| | | } |
| | | |
| | | // SaveMiniDict |
| | | // |
| | | // @Tags 数据字典 |
| | | // @Summary 批量更新迷你字典(会删除原数据) |
| | | // @Produce application/json |
| | | // @Param object body request.SaveMiniDict true "参数" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-wms/v1/dict/save [post] |
| | | func (slf DictController) SaveMiniDict(c *gin.Context) { |
| | | var params request.SaveMiniDict |
| | | if err := c.BindJSON(¶ms); err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | |
| | | if !params.Type.Valid() { |
| | | util.ResponseFormat(c, code.RequestParamError, "字典类型错误") |
| | | return |
| | | } |
| | | |
| | | var records []*models.MiniDict |
| | | for _, v := range params.List { |
| | | if len(v.Name) == 0 { |
| | | util.ResponseFormat(c, code.RequestParamError, "名称为空") |
| | | return |
| | | } |
| | | |
| | | records = append(records, &models.MiniDict{ |
| | | Type: params.Type, |
| | | Name: v.Name, |
| | | IsDefault: v.IsDefault, |
| | | Value: v.Value, |
| | | }) |
| | | } |
| | | |
| | | err := models.WithTransaction(func(tx *gorm.DB) error { |
| | | err := models.NewMiniDictSearch().SetOrm(tx).SetType(params.Type).Delete() |
| | | if err != nil { |
| | | return err |
| | | } |
| | | |
| | | err = models.NewMiniDictSearch().SetOrm(tx).CreateBatch(records) |
| | | if err != nil { |
| | | return err |
| | | } |
| | | return nil |
| | | }) |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "保存失败") |
| | | return |
| | | } |
| | | |
| | | util.ResponseFormat(c, code.Success, "添加成功") |
| | | } |
| | | |
| | | // GetMiniDictList |
| | | // |
| | | // @Tags 数据字典 |
| | | // @Summary 获取迷你字典列表 |
| | | // @Produce application/json |
| | | // @Param object query request.GetMiniDictList true "参数" |
| | | // @Success 200 {object} util.ResponseList{data=[]models.MiniDict} "成功" |
| | | // @Router /api-wms/v1/dict/getDictList [get] |
| | | func (slf DictController) GetMiniDictList(c *gin.Context) { |
| | | var params request.GetMiniDictList |
| | | if err := c.BindJSON(¶ms); err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | |
| | | if !params.Type.Valid() { |
| | | util.ResponseFormat(c, code.RequestParamError, "字典类型错误") |
| | | return |
| | | } |
| | | |
| | | list, total, err := models.NewMiniDictSearch().SetType(params.Type).Find() |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "查找失败") |
| | | return |
| | | } |
| | | |
| | | util.ResponseFormatList(c, code.Success, list, int(total)) |
| | | } |
New file |
| | |
| | | package models |
| | | |
| | | import ( |
| | | "fmt" |
| | | "gorm.io/gorm" |
| | | "wms/constvar" |
| | | "wms/pkg/mysqlx" |
| | | ) |
| | | |
| | | type ( |
| | | // MiniDict 迷你字典 |
| | | MiniDict struct { |
| | | BaseModelInt |
| | | Type constvar.MiniDictType `gorm:"uniqueIndex:idx_type_name;type:int(11);not null;comment:字典类型" json:"type"` // 字典类型 |
| | | Name string `gorm:"uniqueIndex:idx_type_name;;type:varchar(191);not null;comment:名称" json:"name"` // 名称 |
| | | Code string `gorm:"type:varchar(64);;comment:编码" json:"code"` // 编码 |
| | | Value string `gorm:"type:varchar(255);;comment:值" json:"value"` // 值 |
| | | IsDefault bool `gorm:"type:tinyint(1);comment:是否默认" json:"isDefault"` // 是否默认 |
| | | } |
| | | |
| | | MiniDictSearch struct { |
| | | MiniDict |
| | | Order string |
| | | PageNum int |
| | | PageSize int |
| | | Orm *gorm.DB |
| | | } |
| | | ) |
| | | |
| | | func (slf MiniDict) TableName() string { |
| | | return "mini_dict" |
| | | } |
| | | |
| | | func NewMiniDictSearch() *MiniDictSearch { |
| | | return &MiniDictSearch{Orm: mysqlx.GetDB()} |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetOrm(tx *gorm.DB) *MiniDictSearch { |
| | | slf.Orm = tx |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetPage(page, size int) *MiniDictSearch { |
| | | slf.PageNum, slf.PageSize = page, size |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetOrder(order string) *MiniDictSearch { |
| | | slf.Order = order |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetID(id uint) *MiniDictSearch { |
| | | slf.ID = id |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetType(tp constvar.MiniDictType) *MiniDictSearch { |
| | | slf.Type = tp |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetName(name string) *MiniDictSearch { |
| | | slf.Name = name |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) SetValue(value string) *MiniDictSearch { |
| | | slf.Value = value |
| | | return slf |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) build() *gorm.DB { |
| | | var db = slf.Orm.Table(slf.TableName()) |
| | | |
| | | if slf.ID > 0 { |
| | | db = db.Where("id = ?", slf.ID) |
| | | } |
| | | |
| | | if slf.Type > 0 { |
| | | db = db.Where("type = ?", slf.Type) |
| | | } |
| | | |
| | | if slf.Name != "" { |
| | | db = db.Where("name = ?", slf.Name) |
| | | } |
| | | |
| | | if slf.Value != "" { |
| | | db = db.Where("value = ?", slf.Value) |
| | | } |
| | | |
| | | db.Where("1 = 1") |
| | | if slf.Order != "" { |
| | | db = db.Order(slf.Order) |
| | | } |
| | | |
| | | return db |
| | | } |
| | | |
| | | // Create 单条插入 |
| | | func (slf *MiniDictSearch) Create(record *MiniDict) 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 *MiniDictSearch) CreateBatch(records []*MiniDict) 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 *MiniDictSearch) Save(record *MiniDict) 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 *MiniDictSearch) 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 *MiniDictSearch) 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 *MiniDictSearch) Delete() error { |
| | | var db = slf.build() |
| | | |
| | | if err := db.Unscoped().Delete(&MiniDict{}).Error; err != nil { |
| | | return err |
| | | } |
| | | |
| | | return nil |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) First() (*MiniDict, error) { |
| | | var ( |
| | | record = new(MiniDict) |
| | | db = slf.build() |
| | | ) |
| | | |
| | | if err := db.First(record).Error; err != nil { |
| | | return record, err |
| | | } |
| | | |
| | | return record, nil |
| | | } |
| | | |
| | | func (slf *MiniDictSearch) Find() ([]*MiniDict, int64, error) { |
| | | var ( |
| | | records = make([]*MiniDict, 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 *MiniDictSearch) FindNotTotal() ([]*MiniDict, error) { |
| | | var ( |
| | | records = make([]*MiniDict, 0) |
| | | db = slf.build() |
| | | ) |
| | | |
| | | 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 records err: %v", err) |
| | | } |
| | | |
| | | return records, nil |
| | | } |
| | | |
| | | // FindByQuery 指定条件查询. |
| | | func (slf *MiniDictSearch) FindByQuery(query string, args []interface{}) ([]*MiniDict, int64, error) { |
| | | var ( |
| | | records = make([]*MiniDict, 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 *MiniDictSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*MiniDict, error) { |
| | | var ( |
| | | records = make([]*MiniDict, 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 *MiniDictSearch) InitDefaultData() error { |
| | | var ( |
| | | db = slf.Orm.Table(slf.TableName()) |
| | | total int64 = 0 |
| | | ) |
| | | if err := db.Count(&total).Error; err != nil { |
| | | return err |
| | | } |
| | | if total != 0 { |
| | | 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: "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: "99"}) |
| | | err := slf.CreateBatch(dict) |
| | | return err |
| | | } |
New file |
| | |
| | | package request |
| | | |
| | | import "wms/constvar" |
| | | |
| | | type MiniDict struct { |
| | | Name string `json:"name"` // 名称 |
| | | Value string `json:"value"` // 值 |
| | | IsDefault bool `json:"isDefault"` // 是否默认 |
| | | } |
| | | |
| | | type AddMiniDict struct { |
| | | MiniDict |
| | | Type constvar.MiniDictType `json:"type"` // 字典类型 |
| | | } |
| | | |
| | | type EditMiniDict struct { |
| | | MiniDict |
| | | ID int `json:"id"` // 字典类型 |
| | | Type constvar.MiniDictType `json:"type"` // 字典类型 |
| | | } |
| | | |
| | | type SaveMiniDict struct { |
| | | Type constvar.MiniDictType `json:"type"` // 字典类型 |
| | | List []*MiniDict `json:"list"` |
| | | } |
| | | |
| | | type GetMiniDict struct { |
| | | Type constvar.MiniDictType `json:"type"` // 字典类型 |
| | | Name string `json:"name"` // 字典名称 |
| | | } |
| | | |
| | | type GetMiniDictList struct { |
| | | Type constvar.MiniDictType `json:"type"` // 字典类型 |
| | | } |
| | |
| | | attributeValueAPI.GET("primary/:id", attributeValueController.PrimaryAttributeValue) //删除 |
| | | } |
| | | |
| | | // 调拨、出库入库字典配置 |
| | | dictController := new(controllers.DictController) |
| | | dictApi := r.Group(urlPrefix + "/dict") |
| | | { |
| | | dictApi.POST("add", dictController.AddMiniDict) //保存系统设置 |
| | | dictApi.POST("edit", dictController.EditMiniDict) //保存系统设置 |
| | | dictApi.DELETE("delete/:id", dictController.DeleteMiniDict) //保存系统设置 |
| | | dictApi.POST("save", dictController.SaveMiniDict) //保存系统设置 |
| | | dictApi.POST("getDictList", dictController.GetMiniDictList) //获取系统配置 |
| | | } |
| | | |
| | | //系统配置 |
| | | sysCfgCtl := new(controllers.SystemConfigController) |
| | | sysCfgApi := r.Group(urlPrefix + "/systemConfig") |