新增纤度登记及明细

zhangqian

2024-02-29 5c9a0f8184f5e47ea3d8dc8aff5600ae08435a7a

新增纤度登记及明细

 controllers/fineness.go

@@ -7,10 +7,46 @@
    "silkserver/extend/util"
    "silkserver/models"
    "silkserver/pkg/convertx"
    "silkserver/pkg/structx"
)

type FinenessController struct{}

// Add
// @Tags      纤度登记
// @Summary   纤度登记添加
// @Produce   application/json
// @Param     object  body  request.AddFinenessRegister true  "字典信息"
// @Success   200 {object} util.Response "成功"
// @Router    /api-jl/v1/fineness/register [post]
func (slf FinenessController) Add(c *gin.Context) {
    var reqParams request.AddFinenessRegister
    var params models.FinenessRegister
    if err := c.BindJSON(&reqParams); err != nil {
        util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
        return
    }
    if err := structx.AssignTo(reqParams, &params); err != nil {
        util.ResponseFormat(c, code.RequestParamError, "数据转换错误")
        return
    }

    if err := slf.ParamsCheck(params); err != nil {
        util.ResponseFormat(c, code.RequestParamError, err.Error())
        return
    }
    if err := models.NewFinenessRegisterSearch().Create(&params); err != nil {
        util.ResponseFormat(c, code.SaveFail, "插入失败")
        return
    }

    util.ResponseFormat(c, code.Success, "添加成功")
}

func (slf FinenessController) ParamsCheck(params models.FinenessRegister) (err error) {
    return nil
}

// List
// @Tags      纤度登记
// @Summary   纤度登记列表

 controllers/request/fineness.go

@@ -1,5 +1,27 @@
package request

import "github.com/shopspring/decimal"

type AddFinenessRegister struct {
    Number        string         `gorm:"type:varchar(255);not null;comment:编号" json:"number"`        //编号
    FinishDate    string         `gorm:"type:varchar(255);not null;comment:落丝时间" json:"finishDate"`  //落丝时间
    Workshop      string         `gorm:"type:varchar(255);not null;comment:车间" json:"name"`          //车间
    WorkshopGroup string         `gorm:"type:varchar(255);not null;comment:车组" json:"workshopGroup"` //车组
    Market        string         `gorm:"type:varchar(255);not null;comment:庄口" json:"market"`        //庄口
    Spec          string         `gorm:"type:varchar(255);not null;comment:规格" json:"spec"`          //规格
    StartCircle   uint8          `gorm:"type:varchar(255);not null;comment:开始回数" json:"startCircle"` //开始回数
    EndCircle     uint8          `gorm:"type:varchar(255);not null;comment:结束回数" json:"endCircle"`   //结束回数
    FinenessList  []FinenessItem `json:"finenessList"`
    Sum           FinenessItem   `json:"sum"`
}

type FinenessItem struct {
    Position int8            `json:"position"`
    Fineness decimal.Decimal `json:"fineness"`
    Quantity decimal.Decimal `json:"quantity"`
    Sum      decimal.Decimal `json:"sum"`
}

type GetFinenessRegisterList struct {
    PageInfo
}

 docs/docs.go

@@ -62,6 +62,34 @@
                        }
                    }
                }
            },
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "纤度登记"
                ],
                "summary": "纤度登记添加",
                "parameters": [
                    {
                        "description": "字典信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddFinenessRegister"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-jl/v1/fineness/register/{id}": {
@@ -320,6 +348,38 @@
                }
            }
        },
        "models.FinenessItem": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "fineness": {
                    "type": "number"
                },
                "finenessRegisterID": {
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "position": {
                    "type": "integer"
                },
                "quantity": {
                    "type": "number"
                },
                "sum": {
                    "type": "number"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.FinenessRegister": {
            "type": "object",
            "properties": {
@@ -332,6 +392,12 @@
                "endCircle": {
                    "description": "结束回数",
                    "type": "integer"
                },
                "finenessList": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.FinenessItem"
                    }
                },
                "finishDate": {
                    "description": "落丝时间",
@@ -394,6 +460,69 @@
                }
            }
        },
        "request.AddFinenessRegister": {
            "type": "object",
            "properties": {
                "endCircle": {
                    "description": "结束回数",
                    "type": "integer"
                },
                "finenessList": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.FinenessItem"
                    }
                },
                "finishDate": {
                    "description": "落丝时间",
                    "type": "string"
                },
                "market": {
                    "description": "庄口",
                    "type": "string"
                },
                "name": {
                    "description": "车间",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "spec": {
                    "description": "规格",
                    "type": "string"
                },
                "startCircle": {
                    "description": "开始回数",
                    "type": "integer"
                },
                "sum": {
                    "$ref": "#/definitions/request.FinenessItem"
                },
                "workshopGroup": {
                    "description": "车组",
                    "type": "string"
                }
            }
        },
        "request.FinenessItem": {
            "type": "object",
            "properties": {
                "fineness": {
                    "type": "number"
                },
                "position": {
                    "type": "integer"
                },
                "quantity": {
                    "type": "number"
                },
                "sum": {
                    "type": "number"
                }
            }
        },
        "request.UpdateDict": {
            "type": "object",
            "properties": {

 docs/swagger.json

@@ -50,6 +50,34 @@
                        }
                    }
                }
            },
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "纤度登记"
                ],
                "summary": "纤度登记添加",
                "parameters": [
                    {
                        "description": "字典信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddFinenessRegister"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-jl/v1/fineness/register/{id}": {
@@ -308,6 +336,38 @@
                }
            }
        },
        "models.FinenessItem": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "fineness": {
                    "type": "number"
                },
                "finenessRegisterID": {
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "position": {
                    "type": "integer"
                },
                "quantity": {
                    "type": "number"
                },
                "sum": {
                    "type": "number"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.FinenessRegister": {
            "type": "object",
            "properties": {
@@ -320,6 +380,12 @@
                "endCircle": {
                    "description": "结束回数",
                    "type": "integer"
                },
                "finenessList": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.FinenessItem"
                    }
                },
                "finishDate": {
                    "description": "落丝时间",
@@ -382,6 +448,69 @@
                }
            }
        },
        "request.AddFinenessRegister": {
            "type": "object",
            "properties": {
                "endCircle": {
                    "description": "结束回数",
                    "type": "integer"
                },
                "finenessList": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.FinenessItem"
                    }
                },
                "finishDate": {
                    "description": "落丝时间",
                    "type": "string"
                },
                "market": {
                    "description": "庄口",
                    "type": "string"
                },
                "name": {
                    "description": "车间",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "spec": {
                    "description": "规格",
                    "type": "string"
                },
                "startCircle": {
                    "description": "开始回数",
                    "type": "integer"
                },
                "sum": {
                    "$ref": "#/definitions/request.FinenessItem"
                },
                "workshopGroup": {
                    "description": "车组",
                    "type": "string"
                }
            }
        },
        "request.FinenessItem": {
            "type": "object",
            "properties": {
                "fineness": {
                    "type": "number"
                },
                "position": {
                    "type": "integer"
                },
                "quantity": {
                    "type": "number"
                },
                "sum": {
                    "type": "number"
                }
            }
        },
        "request.UpdateDict": {
            "type": "object",
            "properties": {

 docs/swagger.yaml

@@ -48,6 +48,27 @@
      updatedAt:
        type: string
    type: object
  models.FinenessItem:
    properties:
      createdAt:
        type: string
      deletedAt:
        $ref: '#/definitions/gorm.DeletedAt'
      fineness:
        type: number
      finenessRegisterID:
        type: integer
      id:
        type: integer
      position:
        type: integer
      quantity:
        type: number
      sum:
        type: number
      updatedAt:
        type: string
    type: object
  models.FinenessRegister:
    properties:
      createdAt:
@@ -57,6 +78,10 @@
      endCircle:
        description: 结束回数
        type: integer
      finenessList:
        items:
          $ref: '#/definitions/models.FinenessItem'
        type: array
      finishDate:
        description: 落丝时间
        type: string
@@ -98,6 +123,50 @@
      remark:
        description: 备注
        type: string
    type: object
  request.AddFinenessRegister:
    properties:
      endCircle:
        description: 结束回数
        type: integer
      finenessList:
        items:
          $ref: '#/definitions/request.FinenessItem'
        type: array
      finishDate:
        description: 落丝时间
        type: string
      market:
        description: 庄口
        type: string
      name:
        description: 车间
        type: string
      number:
        description: 编号
        type: string
      spec:
        description: 规格
        type: string
      startCircle:
        description: 开始回数
        type: integer
      sum:
        $ref: '#/definitions/request.FinenessItem'
      workshopGroup:
        description: 车组
        type: string
    type: object
  request.FinenessItem:
    properties:
      fineness:
        type: number
      position:
        type: integer
      quantity:
        type: number
      sum:
        type: number
    type: object
  request.UpdateDict:
    properties:
@@ -170,6 +239,24 @@
      summary: 纤度登记列表
      tags:
      - 纤度登记
    post:
      parameters:
      - description: 字典信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddFinenessRegister'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 纤度登记添加
      tags:
      - 纤度登记
  /api-jl/v1/fineness/register/{id}:
    delete:
      parameters:

 go.mod

@@ -56,6 +56,7 @@
    github.com/pelletier/go-toml/v2 v2.1.0 // indirect
    github.com/sagikazarmark/locafero v0.4.0 // indirect
    github.com/sagikazarmark/slog-shim v0.1.0 // indirect
    github.com/shopspring/decimal v1.3.1 // indirect
    github.com/sourcegraph/conc v0.3.0 // indirect
    github.com/spf13/afero v1.11.0 // indirect
    github.com/spf13/cast v1.6.0 // indirect

 go.sum

@@ -109,6 +109,8 @@
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=

 models/db.go

@@ -75,6 +75,7 @@
    err := db.AutoMigrate(
        Dict{},
        FinenessRegister{},
        FinenessItem{},
    )
    return err
}

 models/fineness.go

@@ -10,16 +10,16 @@
    // FinenessRegister 纤度登记
    FinenessRegister struct {
        gorm.Model
        Number        string `gorm:"type:varchar(255);not null;comment:编号" json:"number"`        //编号
        FinishDate    string `gorm:"type:varchar(255);not null;comment:落丝时间" json:"finishDate"`  //落丝时间
        Workshop      string `gorm:"type:varchar(255);not null;comment:车间" json:"name"`          //车间
        WorkshopGroup string `gorm:"type:varchar(255);not null;comment:车组" json:"workshopGroup"` //车组
        Market        string `gorm:"type:varchar(255);not null;comment:庄口" json:"market"`        //庄口
        Spec          string `gorm:"type:varchar(255);not null;comment:规格" json:"spec"`          //规格
        StartCircle   uint8  `gorm:"type:varchar(255);not null;comment:开始回数" json:"startCircle"` //开始回数
        EndCircle     uint8  `gorm:"type:varchar(255);not null;comment:结束回数" json:"endCircle"`   //结束回数
        Number        string         `gorm:"type:varchar(255);not null;comment:编号" json:"number"`        //编号
        FinishDate    string         `gorm:"type:varchar(255);not null;comment:落丝时间" json:"finishDate"`  //落丝时间
        Workshop      string         `gorm:"type:varchar(255);not null;comment:车间" json:"name"`          //车间
        WorkshopGroup string         `gorm:"type:varchar(255);not null;comment:车组" json:"workshopGroup"` //车组
        Market        string         `gorm:"type:varchar(255);not null;comment:庄口" json:"market"`        //庄口
        Spec          string         `gorm:"type:varchar(255);not null;comment:规格" json:"spec"`          //规格
        StartCircle   uint8          `gorm:"type:varchar(255);not null;comment:开始回数" json:"startCircle"` //开始回数
        EndCircle     uint8          `gorm:"type:varchar(255);not null;comment:结束回数" json:"endCircle"`   //结束回数
        FinenessList  []FinenessItem `gorm:"foreignkey:FinenessRegisterID" json:"finenessList"`
    }

    FinenessRegisterSearch struct {
        FinenessRegister
        Order    string

 models/fineness_item.go

New file
@@ -0,0 +1,238 @@
package models

import (
    "fmt"
    "github.com/shopspring/decimal"
    "gorm.io/gorm"
    "silkserver/pkg/mysqlx"
)

type (
    // FinenessItem 纤度登记
    FinenessItem struct {
        gorm.Model
        FinenessRegisterID uint            `json:"finenessRegisterID"`
        Position           int8            `json:"position"`
        Fineness           decimal.Decimal `json:"fineness"`
        Quantity           decimal.Decimal `json:"quantity"`
        Sum                decimal.Decimal `json:"sum"`
    }

    FinenessItemSearch struct {
        FinenessItem
        Order    string
        PageNum  int
        PageSize int
        Orm      *gorm.DB
    }
)

func (slf *FinenessItem) TableName() string {
    return "fineness_register_item"
}

func NewFinenessItemSearch() *FinenessItemSearch {
    return &FinenessItemSearch{Orm: mysqlx.GetDB()}
}

func (slf *FinenessItemSearch) SetOrm(tx *gorm.DB) *FinenessItemSearch {
    slf.Orm = tx
    return slf
}

func (slf *FinenessItemSearch) SetPage(page, size int) *FinenessItemSearch {
    slf.PageNum, slf.PageSize = page, size
    return slf
}

func (slf *FinenessItemSearch) SetOrder(order string) *FinenessItemSearch {
    slf.Order = order
    return slf
}

func (slf *FinenessItemSearch) SetID(id uint) *FinenessItemSearch {
    slf.ID = id
    return slf
}

func (slf *FinenessItemSearch) 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)
    }

    return db
}

// Create 单条插入
func (slf *FinenessItemSearch) Create(record *FinenessItem) 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 *FinenessItemSearch) CreateBatch(records []*FinenessItem) 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 *FinenessItemSearch) Save(record *FinenessItem) 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 *FinenessItemSearch) Update(record *FinenessItem) 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 *FinenessItemSearch) 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 *FinenessItemSearch) 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 *FinenessItemSearch) Delete() error {
    var db = slf.build()

    if err := db.Unscoped().Delete(&FinenessItem{}).Error; err != nil {
        return err
    }

    return nil
}

func (slf *FinenessItemSearch) First() (*FinenessItem, error) {
    var (
        record = new(FinenessItem)
        db     = slf.build()
    )

    if err := db.First(record).Error; err != nil {
        return record, err
    }

    return record, nil
}

func (slf *FinenessItemSearch) Find() ([]*FinenessItem, int64, error) {
    var (
        records = make([]*FinenessItem, 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 *FinenessItemSearch) FindAll() ([]*FinenessItem, error) {
    var (
        records = make([]*FinenessItem, 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 *FinenessItemSearch) FindByQuery(query string, args []interface{}) ([]*FinenessItem, int64, error) {
    var (
        records = make([]*FinenessItem, 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 *FinenessItemSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*FinenessItem, error) {
    var (
        records = make([]*FinenessItem, 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 *FinenessItemSearch) InitDefaultData() error {
    return nil
}

 router/router.go

@@ -37,6 +37,7 @@
    {
        finenessApi.GET("register", FinenessController.List)          // 获取纤度登记列表
        finenessApi.DELETE("register/:id", FinenessController.Delete) // 删除纤度登记
        finenessApi.POST("register", FinenessController.Add)          // 新增纤度登记
    }

    return r