字段修改

liujiandao

2024-04-12 dae660c3b5b6a9b7b32f40e88a576b81a1054561

字段修改

 controllers/request/yield_register_request.go

@@ -13,7 +13,7 @@
    Number                  string                    `json:"number"`                  //编号
    CreateTime              string                    `json:"createTime"`              //创建时间
    MarketId                uint                      `json:"marketId"`                //庄口id
    WorkshopId              uint                      `json:"workshopId"`              //车间id
    WorkshopNumber          string                    `json:"workshopNumber"`          //车间编码
    GroupNumber             int                       `json:"groupNumber"`             //组别
    Spec                    string                    `json:"spec"`                    //规格
    JieZhuang               string                    `json:"jieZhuang"`               //是否结庄
@@ -67,9 +67,9 @@
}

type ChangeYieldRegister struct {
    CreateTime  string `json:"createTime"`  //创建时间
    MarketId    uint   `json:"marketId"`    //庄口id
    WorkshopId  uint   `json:"workshopId"`  //车间id
    GroupNumber int    `json:"groupNumber"` //组别
    Spec        string `json:"spec"`        //规格
    CreateTime     string `json:"createTime"`     //创建时间
    MarketId       uint   `json:"marketId"`       //庄口id
    WorkshopNumber string `json:"workshopNumber"` //车间编码
    GroupNumber    int    `json:"groupNumber"`    //组别
    Spec           string `json:"spec"`           //规格
}

 controllers/yield_register_controller.go

@@ -108,7 +108,9 @@
        for _, dict := range all {
            if register.MarketId == dict.ID {
                register.MarketName = dict.Name
                break
            }
            if register.WorkshopNumber == dict.Number {
                register.WorkshopName = dict.Name
            }
        }
    }
@@ -203,7 +205,7 @@
        return
    }
    first, err := models.NewYieldRegisterSearch().SetGroupNumber(params.GroupNumber).SetCreateTime(params.CreateTime).
        SetMarketId(params.MarketId).SetWorkshopId(params.WorkshopId).SetSpec(params.Spec).SetPreload(true).First()
        SetMarketId(params.MarketId).SetWorkshopNumber(params.WorkshopNumber).SetSpec(params.Spec).SetPreload(true).First()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查询失败")
        return

 docs/docs.go

@@ -1701,11 +1701,11 @@
                "vehicleSpeed": {
                    "type": "number"
                },
                "workshopId": {
                    "type": "integer"
                },
                "workshopName": {
                    "description": "车间名",
                    "type": "string"
                },
                "workshopNumber": {
                    "type": "string"
                }
            }
@@ -1890,9 +1890,9 @@
                    "description": "规格",
                    "type": "string"
                },
                "workshopId": {
                    "description": "车间id",
                    "type": "integer"
                "workshopNumber": {
                    "description": "车间编码",
                    "type": "string"
                }
            }
        },
@@ -2226,9 +2226,9 @@
                    "description": "实时车速",
                    "type": "number"
                },
                "workshopId": {
                    "description": "车间id",
                    "type": "integer"
                "workshopNumber": {
                    "description": "车间编码",
                    "type": "string"
                }
            }
        },

 docs/swagger.json

@@ -1689,11 +1689,11 @@
                "vehicleSpeed": {
                    "type": "number"
                },
                "workshopId": {
                    "type": "integer"
                },
                "workshopName": {
                    "description": "车间名",
                    "type": "string"
                },
                "workshopNumber": {
                    "type": "string"
                }
            }
@@ -1878,9 +1878,9 @@
                    "description": "规格",
                    "type": "string"
                },
                "workshopId": {
                    "description": "车间id",
                    "type": "integer"
                "workshopNumber": {
                    "description": "车间编码",
                    "type": "string"
                }
            }
        },
@@ -2214,9 +2214,9 @@
                    "description": "实时车速",
                    "type": "number"
                },
                "workshopId": {
                    "description": "车间id",
                    "type": "integer"
                "workshopNumber": {
                    "description": "车间编码",
                    "type": "string"
                }
            }
        },

 docs/swagger.yaml

@@ -382,10 +382,10 @@
        type: string
      vehicleSpeed:
        type: number
      workshopId:
        type: integer
      workshopName:
        description: 车间名
        type: string
      workshopNumber:
        type: string
    type: object
  models.YieldRegisterCircle:
@@ -512,9 +512,9 @@
      spec:
        description: 规格
        type: string
      workshopId:
        description: 车间id
        type: integer
      workshopNumber:
        description: 车间编码
        type: string
    type: object
  request.DynamicsRank:
    properties:
@@ -749,9 +749,9 @@
      vehicleSpeed:
        description: 实时车速
        type: number
      workshopId:
        description: 车间id
        type: integer
      workshopNumber:
        description: 车间编码
        type: string
    type: object
  request.YieldRegisterItemInfo:
    properties:

 models/yield_register.go

@@ -14,7 +14,7 @@
        Number                  string                 `json:"number" gorm:"type:varchar(255);not null;comment:编号"`
        CreateTime              string                 `json:"createTime" gorm:"type:varchar(255);comment:创建时间"`
        MarketId                uint                   `json:"marketId" gorm:"type:int(11);comment:庄口id"`
        WorkshopId              uint                   `json:"workshopId" gorm:"type:int(11);comment:车间id"`
        WorkshopNumber          string                 `json:"workshopNumber" gorm:"type:varchar(255);comment:车间编码"`
        GroupNumber             int                    `json:"groupNumber" gorm:"type:int(11);comment:组别"`
        Spec                    string                 `json:"spec" gorm:"type:varchar(255);comment:规格"`
        JieZhuang               string                 `json:"jieZhuang" gorm:"type:varchar(255);comment:是否结庄"`
@@ -93,8 +93,8 @@
    return slf
}

func (slf *YieldRegisterSearch) SetWorkshopId(workshopId uint) *YieldRegisterSearch {
    slf.WorkshopId = workshopId
func (slf *YieldRegisterSearch) SetWorkshopNumber(workshopNumber string) *YieldRegisterSearch {
    slf.WorkshopNumber = workshopNumber
    return slf
}

@@ -123,8 +123,8 @@
        db = db.Where("create_time = ?", slf.CreateTime)
    }

    if slf.WorkshopId > 0 {
        db = db.Where("workshop_id = ?", slf.WorkshopId)
    if slf.WorkshopNumber != "" {
        db = db.Where("workshop_number = ?", slf.WorkshopNumber)
    }

    if slf.MarketId > 0 {