1个文件已删除
2个文件已添加
1 文件已重命名
3个文件已修改
| | |
| | | UserTypePrimary // 主账户 |
| | | UserTypeSub // 子账户 |
| | | ) |
| | | |
| | | type CarFlag int |
| | | |
| | | const ( |
| | | LeftHalfCar CarFlag = iota + 1 //左半车 |
| | | RightHalfCar //右半车 |
| | | AllCar //全车 |
| | | ) |
File was renamed from controllers/request/dict.go |
| | |
| | | ID uint `gorm:"comment:主键ID;primaryKey;" json:"id"` |
| | | AddDict |
| | | } |
| | | |
| | | // ---------------------------------------生丝--------------------------------- |
| | | type GetPriceStandard struct { |
| | | PageInfo |
| | | KeyWord string `json:"keyWord"` |
| | | } |
| | | |
| | | // ---------------------------------------车间--------------------------------- |
| | | type GetWorkshopManage struct { |
| | | PageInfo |
| | | KeyWord string `json:"keyWord"` |
| | | } |
New file |
| | |
| | | package controllers |
| | | |
| | | import ( |
| | | "github.com/gin-gonic/gin" |
| | | "silkserver/controllers/request" |
| | | "silkserver/extend/code" |
| | | "silkserver/extend/util" |
| | | "silkserver/models" |
| | | "strconv" |
| | | ) |
| | | |
| | | type WorkshopManageController struct { |
| | | } |
| | | |
| | | // SaveWorkshopManage |
| | | // |
| | | // @Tags 系统设置/车间管理 |
| | | // @Summary 保存车间管理 |
| | | // @Produce application/json |
| | | // @Param object body models.WorkshopManage true "参数" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-jl/v1/system/saveWorkshopManage [post] |
| | | func (slf WorkshopManageController) SaveWorkshopManage(c *gin.Context) { |
| | | var workshop models.WorkshopManage |
| | | err := c.BindJSON(&workshop) |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | if workshop.ID > 0 { |
| | | err = models.NewWorkshopManageSearch().Save(&workshop) |
| | | } else { |
| | | err = models.NewWorkshopManageSearch().Create(&workshop) |
| | | } |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.SaveFail, "保存失败") |
| | | return |
| | | } |
| | | util.ResponseFormat(c, code.Success, "保存成功") |
| | | } |
| | | |
| | | // GetWorkshopManageList |
| | | // |
| | | // @Tags 系统设置/车间管理 |
| | | // @Summary 获取车间管理列表 |
| | | // @Produce application/json |
| | | // @Param object query request.GetPriceStandard true "参数" |
| | | // @Success 200 {object} util.ResponseList{data=[]models.WorkshopManage} "成功" |
| | | // @Router /api-jl/v1/system/getWorkshopManageList [get] |
| | | func (slf WorkshopManageController) GetWorkshopManageList(c *gin.Context) { |
| | | var param request.GetWorkshopManage |
| | | err := c.ShouldBindQuery(¶m) |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误") |
| | | return |
| | | } |
| | | list, total, err := models.NewWorkshopManageSearch().SetPage(param.Page, param.PageSize).Find() |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.SelectError, "查询失败") |
| | | return |
| | | } |
| | | util.ResponseFormatList(c, code.Success, list, total) |
| | | } |
| | | |
| | | // DeleteWorkshopManage |
| | | // |
| | | // @Tags 系统设置/车间管理 |
| | | // @Summary 删除车间管理 |
| | | // @Produce application/json |
| | | // @Param id path string true "id" |
| | | // @Success 200 {object} util.Response "成功" |
| | | // @Router /api-jl/v1/system/deleteWorkshopManage/{id} [delete] |
| | | func (slf WorkshopManageController) DeleteWorkshopManage(c *gin.Context) { |
| | | id := c.Param("id") |
| | | if id == "" { |
| | | util.ResponseFormat(c, code.RequestParamError, "无效的id") |
| | | return |
| | | } |
| | | atoi, err := strconv.Atoi(id) |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "数据转换失败") |
| | | return |
| | | } |
| | | err = models.NewWorkshopManageSearch().SetId(atoi).Delete() |
| | | if err != nil { |
| | | util.ResponseFormat(c, code.RequestParamError, "删除失败") |
| | | return |
| | | } |
| | | util.ResponseFormat(c, code.RequestParamError, "删除成功") |
| | | } |
| | |
| | | "silkserver/pkg/mysqlx" |
| | | ) |
| | | |
| | | // RawSilkPriceStandard |
| | | // RawSilkPriceStandard 生丝定价管理 |
| | | type ( |
| | | RawSilkPriceStandard struct { |
| | | gorm.Model |
New file |
| | |
| | | package models |
| | | |
| | | import ( |
| | | "fmt" |
| | | "gorm.io/gorm" |
| | | "silkserver/constvar" |
| | | "silkserver/pkg/mysqlx" |
| | | ) |
| | | |
| | | // WorkshopManage 车间管理 |
| | | type ( |
| | | WorkshopManage struct { |
| | | gorm.Model |
| | | WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:车间编号"` |
| | | GroupNumber int `json:"groupNumber" gorm:"type:int(11);comment:组别"` |
| | | StartCarNumber int `json:"startCarNumber" gorm:"type:int(11);comment:组别"` |
| | | EndCarNumber int `json:"endCarNumber" gorm:"type:int(11);comment:组别"` |
| | | CarFlag constvar.CarFlag `json:"carFlag" gorm:"type:int(1);comment:半车标志"` |
| | | Notes string `json:"notes" gorm:"type:varchar(255);comment:备注"` |
| | | } |
| | | WorkshopManageSearch struct { |
| | | WorkshopManage |
| | | PageNum int |
| | | PageSize int |
| | | Orm *gorm.DB |
| | | } |
| | | ) |
| | | |
| | | func (slf WorkshopManage) TableName() string { |
| | | return "workshop_manage" |
| | | } |
| | | |
| | | func NewWorkshopManageSearch() *WorkshopManageSearch { |
| | | return &WorkshopManageSearch{Orm: mysqlx.GetDB()} |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) SetOrm(tx *gorm.DB) *WorkshopManageSearch { |
| | | slf.Orm = tx |
| | | return slf |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) SetPage(page, size int) *WorkshopManageSearch { |
| | | slf.PageNum, slf.PageSize = page, size |
| | | return slf |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) SetId(id int) *WorkshopManageSearch { |
| | | slf.ID = uint(id) |
| | | return slf |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) build() *gorm.DB { |
| | | db := slf.Orm.Table(slf.TableName()) |
| | | |
| | | if slf.ID > 0 { |
| | | db = db.Where("id = ?", slf.ID) |
| | | } |
| | | |
| | | return db |
| | | } |
| | | |
| | | // Create 单条插入 |
| | | func (slf *WorkshopManageSearch) Create(record *WorkshopManage) error { |
| | | db := slf.build() |
| | | err := db.Create(record).Error |
| | | if err != nil { |
| | | return fmt.Errorf("create err: %v, record: %+v", err, record) |
| | | } |
| | | return nil |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) Find() ([]*WorkshopManage, int64, error) { |
| | | var ( |
| | | records = make([]*WorkshopManage, 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 *WorkshopManageSearch) Save(record *WorkshopManage) error { |
| | | var db = slf.build() |
| | | |
| | | if err := db.Save(record).Error; err != nil { |
| | | return fmt.Errorf("save err: %v, record: %+v", err, record) |
| | | } |
| | | |
| | | return nil |
| | | } |
| | | |
| | | func (slf *WorkshopManageSearch) Delete() error { |
| | | var db = slf.build() |
| | | |
| | | if err := db.Unscoped().Delete(&WorkshopManage{}).Error; err != nil { |
| | | return err |
| | | } |
| | | |
| | | return nil |
| | | } |
| | |
| | | |
| | | urlPrefix := "/api-jl/v1" |
| | | |
| | | // 词典管理 |
| | | // 系统设置 |
| | | DictController := new(controllers.DictController) |
| | | rawSilkController := new(controllers.RawSilkStandardController) |
| | | workshopController := new(controllers.WorkshopManageController) |
| | | systemApi := r.Group(urlPrefix + "/system") |
| | | { |
| | | //词典管理 |
| | | systemApi.GET("dict", DictController.List) // 获取词典列表 |
| | | systemApi.POST("dict", DictController.Add) // 新增词典 |
| | | systemApi.PUT("dict", DictController.Update) // 修改词典 |
| | | systemApi.DELETE("dict/:id", DictController.Delete) // 删除词典 |
| | | // 生丝管理 |
| | | systemApi.GET("getPriceStandardList", rawSilkController.GetPriceStandardList) //获取生丝定价标准 |
| | | systemApi.POST("savePriceStandard", rawSilkController.SavePriceStandard) //保存生丝定价标准 |
| | | systemApi.DELETE("deletePriceStandard/:id", rawSilkController.DeletePriceStandard) //删除生丝定价标准 |
| | | //车间管理 |
| | | systemApi.GET("getWorkshopManageList", workshopController.GetWorkshopManageList) //获取车间管理列表 |
| | | systemApi.POST("saveWorkshopManage", workshopController.SaveWorkshopManage) //保存车间管理 |
| | | systemApi.DELETE("deleteWorkshopManage/:id", workshopController.DeleteWorkshopManage) //删除车间管理 |
| | | } |
| | | |
| | | // 生产管理 |
| | |
| | | finenessApi.DELETE("register/:id", FinenessController.Delete) // 删除纤度登记 |
| | | finenessApi.POST("register", FinenessController.Add) // 新增纤度登记 |
| | | finenessApi.GET("register/:id", FinenessController.Info) // 获取纤度登记详情 |
| | | } |
| | | |
| | | // 生丝管理 |
| | | rawSilkController := new(controllers.RawSilkStandardController) |
| | | rawSilkApi := r.Group(urlPrefix + "/system") |
| | | { |
| | | rawSilkApi.GET("getPriceStandardList", rawSilkController.GetPriceStandardList) //获取生丝定价标准 |
| | | rawSilkApi.POST("savePriceStandard", rawSilkController.SavePriceStandard) //保存生丝定价标准 |
| | | rawSilkApi.DELETE("DeletePriceStandard/:id", rawSilkController.DeletePriceStandard) //删除生丝定价标准 |
| | | } |
| | | |
| | | return r |