liujiandao
2024-04-11 db3aaff2a2c18cf22902bf2071929a2b3af89342
获取车辆编号和等级
1个文件已添加
8个文件已修改
418 ■■■■■ 已修改文件
controllers/request/system_set.go 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/response/system_set_response.go 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/workshop_manage_controller.go 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.json 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.yaml 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/fineness.go 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/workshop_manage.go 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
router/router.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/request/system_set.go
@@ -57,6 +57,7 @@
}
type GetWorkshopManageCar struct {
    WorkshopNumber string `json:"workshopNumber"`
    GroupNumber    int    `json:"groupNumber"`
    WorkshopName string `json:"workshopName"` //车间名称
    GroupNumber  int    `json:"groupNumber"`  //组别
    MarketName   string `json:"marketName"`   ///庄口名
}
controllers/response/system_set_response.go
New file
@@ -0,0 +1,6 @@
package response
type CarAndLevel struct {
    Car   [][]int `json:"car"`
    Level string  `json:"level"`
}
controllers/workshop_manage_controller.go
@@ -4,6 +4,7 @@
    "github.com/gin-gonic/gin"
    "silkserver/constvar"
    "silkserver/controllers/request"
    "silkserver/controllers/response"
    "silkserver/extend/code"
    "silkserver/extend/util"
    "silkserver/models"
@@ -119,27 +120,41 @@
    util.ResponseFormat(c, code.Success, groupMap)
}
// GetWorkshopManageCar
// GetCarAndLevel
//
//    @Tags        系统设置/车间管理
//    @Summary    获取车辆编号
//    @Summary    获取车辆编号和等级
//    @Produce    application/json
//    @Param     Authorization    header string true "token"
//    @Param        object    body        request.GetWorkshopManageCar    true    "参数"
//    @Success    200        {object}    util.ResponseList{data=[][]int}        "成功"
//    @Router        /api-jl/v1/system/getWorkshopManageCar [post]
func (slf WorkshopManageController) GetWorkshopManageCar(c *gin.Context) {
//    @Success    200        {object}    util.Response{data=response.CarAndLevel}        "成功"
//    @Router        /api-jl/v1/system/getCarAndLevel [post]
func (slf WorkshopManageController) GetCarAndLevel(c *gin.Context) {
    var params request.GetWorkshopManageCar
    err := c.BindJSON(&params)
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "参数解析失败,数据类型错误")
        return
    }
    all, err := models.NewWorkshopManageSearch().SetWorkshopNumber(params.WorkshopNumber).SetGroupNumber(params.GroupNumber).FindAll()
    all, err := models.NewWorkshopManageSearch().SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).FindAll()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    fineness, err := models.NewFinenessRegisterSearch().SetWorkshop(params.WorkshopName).SetWorkshopGroup(params.GroupNumber).
        SetMarket(params.MarketName).First()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    first, err := models.NewFinenessCheckSearch().SetID(fineness.FinenessCheckID).First()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    var data response.CarAndLevel
    data.Level = first.FinenessGrade
    carNum := make([][]int, 0)
    for _, manage := range all {
        car := make([]int, 0)
@@ -154,5 +169,7 @@
            carNum = append(carNum, car)
        }
    }
    util.ResponseFormat(c, code.Success, carNum)
    data.Car = carNum
    util.ResponseFormat(c, code.Success, data)
}
docs/docs.go
@@ -722,6 +722,55 @@
                }
            }
        },
        "/api-jl/v1/system/getCarAndLevel": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "系统设置/车间管理"
                ],
                "summary": "获取车辆编号和等级",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetWorkshopManageCar"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.CarAndLevel"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-jl/v1/system/getPriceStandardList": {
            "get": {
                "produces": [
@@ -833,61 +882,6 @@
                                            "type": "object",
                                            "additionalProperties": {
                                                "type": "string"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-jl/v1/system/getWorkshopManageCar": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "系统设置/车间管理"
                ],
                "summary": "获取车辆编号",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetWorkshopManageCar"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "type": "array",
                                                "items": {
                                                    "type": "integer"
                                                }
                                            }
                                        }
                                    }
@@ -1883,9 +1877,15 @@
            "type": "object",
            "properties": {
                "groupNumber": {
                    "description": "组别",
                    "type": "integer"
                },
                "workshopNumber": {
                "marketName": {
                    "description": "/庄口名",
                    "type": "string"
                },
                "workshopName": {
                    "description": "车间名称",
                    "type": "string"
                }
            }
@@ -2178,6 +2178,23 @@
                }
            }
        },
        "response.CarAndLevel": {
            "type": "object",
            "properties": {
                "car": {
                    "type": "array",
                    "items": {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        }
                    }
                },
                "level": {
                    "type": "string"
                }
            }
        },
        "response.DynamicsRank": {
            "type": "object",
            "properties": {
docs/swagger.json
@@ -710,6 +710,55 @@
                }
            }
        },
        "/api-jl/v1/system/getCarAndLevel": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "系统设置/车间管理"
                ],
                "summary": "获取车辆编号和等级",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetWorkshopManageCar"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.CarAndLevel"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-jl/v1/system/getPriceStandardList": {
            "get": {
                "produces": [
@@ -821,61 +870,6 @@
                                            "type": "object",
                                            "additionalProperties": {
                                                "type": "string"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-jl/v1/system/getWorkshopManageCar": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "系统设置/车间管理"
                ],
                "summary": "获取车辆编号",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetWorkshopManageCar"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "type": "array",
                                                "items": {
                                                    "type": "integer"
                                                }
                                            }
                                        }
                                    }
@@ -1871,9 +1865,15 @@
            "type": "object",
            "properties": {
                "groupNumber": {
                    "description": "组别",
                    "type": "integer"
                },
                "workshopNumber": {
                "marketName": {
                    "description": "/庄口名",
                    "type": "string"
                },
                "workshopName": {
                    "description": "车间名称",
                    "type": "string"
                }
            }
@@ -2166,6 +2166,23 @@
                }
            }
        },
        "response.CarAndLevel": {
            "type": "object",
            "properties": {
                "car": {
                    "type": "array",
                    "items": {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        }
                    }
                },
                "level": {
                    "type": "string"
                }
            }
        },
        "response.DynamicsRank": {
            "type": "object",
            "properties": {
docs/swagger.yaml
@@ -540,8 +540,13 @@
  request.GetWorkshopManageCar:
    properties:
      groupNumber:
        description: 组别
        type: integer
      workshopNumber:
      marketName:
        description: /庄口名
        type: string
      workshopName:
        description: 车间名称
        type: string
    type: object
  request.GetYieldRegisterList:
@@ -747,6 +752,17 @@
      yieldRegisterId:
        description: 产量登记表id
        type: integer
    type: object
  response.CarAndLevel:
    properties:
      car:
        items:
          items:
            type: integer
          type: array
        type: array
      level:
        type: string
    type: object
  response.DynamicsRank:
    properties:
@@ -1257,6 +1273,35 @@
      summary: 删除字典
      tags:
      - 系统设置/字典
  /api-jl/v1/system/getCarAndLevel:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetWorkshopManageCar'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.Response'
            - properties:
                data:
                  $ref: '#/definitions/response.CarAndLevel'
              type: object
      summary: 获取车辆编号和等级
      tags:
      - 系统设置/车间管理
  /api-jl/v1/system/getPriceStandardList:
    get:
      parameters:
@@ -1326,39 +1371,6 @@
      summary: 获取生丝等级
      tags:
      - 系统设置/生丝定级标准
  /api-jl/v1/system/getWorkshopManageCar:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetWorkshopManageCar'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    items:
                      type: integer
                    type: array
                  type: array
              type: object
      summary: 获取车辆编号
      tags:
      - 系统设置/车间管理
  /api-jl/v1/system/getWorkshopManageGroup/{number}:
    get:
      parameters:
models/fineness.go
@@ -79,6 +79,21 @@
    return slf
}
func (slf *FinenessRegisterSearch) SetWorkshop(workshop string) *FinenessRegisterSearch {
    slf.Workshop = workshop
    return slf
}
func (slf *FinenessRegisterSearch) SetMarket(market string) *FinenessRegisterSearch {
    slf.Market = market
    return slf
}
func (slf *FinenessRegisterSearch) SetWorkshopGroup(group int) *FinenessRegisterSearch {
    slf.WorkshopGroup = group
    return slf
}
func (slf *FinenessRegisterSearch) build() *gorm.DB {
    var db = slf.Orm.Table(slf.TableName())
@@ -102,6 +117,18 @@
        db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    }
    if slf.Workshop != "" {
        db = db.Where("workshop = ?", slf.Workshop)
    }
    if slf.Market != "" {
        db = db.Where("market = ?", slf.Market)
    }
    if slf.WorkshopGroup > 0 {
        db = db.Where("workshop_group = ?", slf.WorkshopGroup)
    }
    return db
}
models/workshop_manage.go
@@ -56,6 +56,11 @@
    return slf
}
func (slf *WorkshopManageSearch) SetWorkshopName(workshopName string) *WorkshopManageSearch {
    slf.WorkshopName = workshopName
    return slf
}
func (slf *WorkshopManageSearch) SetGroupNumber(groupNumber int) *WorkshopManageSearch {
    slf.GroupNumber = groupNumber
    return slf
@@ -77,6 +82,10 @@
        db = db.Where("workshop_number = ?", slf.WorkshopNumber)
    }
    if slf.WorkshopName != "" {
        db = db.Where("workshop_name = ?", slf.WorkshopName)
    }
    if slf.GroupNumber != 0 {
        db = db.Where("group_number = ?", slf.GroupNumber)
    }
router/router.go
@@ -47,7 +47,7 @@
        systemApi.POST("saveWorkshopManage", workshopController.SaveWorkshopManage)                //保存车间管理
        systemApi.DELETE("deleteWorkshopManage/:id", workshopController.DeleteWorkshopManage)      //删除车间管理
        systemApi.GET("getWorkshopManageGroup/:number", workshopController.GetWorkshopManageGroup) //获取车间组别
        systemApi.POST("getWorkshopManageCar", workshopController.GetWorkshopManageCar)            //获取车辆编号
        systemApi.POST("getCarAndLevel", workshopController.GetCarAndLevel)                        //获取车辆编号和等级
    }
    // 生产管理