zhangqian
2024-04-08 369345210a59c15354000e5754165be8a1278415
更新文档
6个文件已修改
286 ■■■■ 已修改文件
controllers/fineness.go 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/workshop_manage_controller.go 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.json 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.yaml 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
router/router.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/fineness.go
@@ -5,6 +5,7 @@
    "github.com/gin-gonic/gin"
    "gorm.io/gorm"
    "silkserver/controllers/request"
    "silkserver/controllers/response"
    "silkserver/extend/code"
    "silkserver/extend/util"
    "silkserver/models"
@@ -170,7 +171,7 @@
// @Summary   纤度检验列表
// @Produce   application/json
// @Param     object  query    request.GetFinenessRegisterList true  "查询参数"
// @Success   200   {object}  util.ResponseList{data=[]models.FinenessRegister}  "成功"
// @Success   200   {object}  util.ResponseList{data=[]models.FinenessCheck}  "成功"
// @Router    /api-jl/v1/fineness/check [get]
func (slf FinenessController) CheckList(c *gin.Context) {
    var params request.GetFinenessRegisterList
@@ -193,32 +194,35 @@
// @Summary   纤度检验详情
// @Produce   application/json
// @Param     id  path string true  "字典信息"
// @Success   200 {object} util.ResponseList{data=models.FinenessRegister} "成功"
// @Success   200 {object} util.ResponseList{data=models.FinenessCheck} "成功"
// @Router    /api-jl/v1/fineness/check/{id} [get]
func (slf FinenessController) CheckInfo(c *gin.Context) {
    //idStr := c.Param("id")
    //if idStr == "0" || idStr == "" {
    //    util.ResponseFormat(c, code.RequestParamError, "空的记录id")
    //    return
    //}
    //
    //id := convertx.StringToUInt(idStr)
    //if id == 0 {
    //    util.ResponseFormat(c, code.RequestParamError, "空的记录id")
    //    return
    //}
    //
    //info, err := models.NewFinenessCheckSearch().SetID(id).SetPreload().First()
    //if err != nil {
    //    util.ResponseFormat(c, code.RequestParamError, "查找失败")
    //    return
    //}
    //resp := new(response.FinenessCheckInfo)
    //resp.Info = info
    //resp.Items, err := models.NewFinenessCheckItemSearch().SetPage()
    //
    //
    //util.ResponseFormat(c, code.Success, info)
    idStr := c.Param("id")
    if idStr == "0" || idStr == "" {
        util.ResponseFormat(c, code.RequestParamError, "空的记录id")
        return
    }
    id := convertx.StringToUInt(idStr)
    if id == 0 {
        util.ResponseFormat(c, code.RequestParamError, "空的记录id")
        return
    }
    info, err := models.NewFinenessCheckSearch().SetID(id).SetPreload().First()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    resp := new(response.FinenessCheckInfo)
    resp.Info = info
    resp.Items, err = models.NewFinenessCheckItemSearch().SetFinenessRegisterID(info.FinenessRegisterID).FindAll()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    util.ResponseFormat(c, code.Success, info)
}
// CheckDelete
controllers/workshop_manage_controller.go
@@ -44,12 +44,13 @@
// 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]
//        @Tags        系统设置/车间管理
//        @Summary    获取车间管理列表
//        @Produce    application/json
//     @Param     Authorization    header string true "token"
//        @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(&param)
docs/docs.go
@@ -58,7 +58,7 @@
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.FinenessRegister"
                                                "$ref": "#/definitions/models.FinenessCheck"
                                            }
                                        }
                                    }
@@ -127,7 +127,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.FinenessRegister"
                                            "$ref": "#/definitions/models.FinenessCheck"
                                        }
                                    }
                                }
@@ -628,6 +628,13 @@
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "name": "keyWord",
                        "in": "query"
                    },
@@ -880,6 +887,75 @@
                }
            }
        },
        "models.FinenessCheck": {
            "type": "object",
            "properties": {
                "averageFineness": {
                    "description": "平均纤度",
                    "type": "number"
                },
                "cleanliness": {
                    "description": "清洁度",
                    "type": "number"
                },
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "deviation": {
                    "description": "偏差",
                    "type": "number"
                },
                "finenessGrade": {
                    "description": "纤度等级",
                    "type": "string"
                },
                "finenessRegister": {
                    "description": "纤度登记",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.FinenessRegister"
                        }
                    ]
                },
                "finenessRegisterID": {
                    "description": "纤度登记表ID",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "inspector": {
                    "description": "检验员",
                    "type": "string"
                },
                "marketProcessOrderNumber": {
                    "description": "庄口工艺单编号",
                    "type": "string"
                },
                "measureFineness": {
                    "description": "公量纤度",
                    "type": "number"
                },
                "purity": {
                    "description": "洁净度",
                    "type": "number"
                },
                "totalDeviation": {
                    "description": "总差",
                    "type": "number"
                },
                "twiceChange": {
                    "description": "二度变化",
                    "type": "number"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.FinenessItem": {
            "type": "object",
            "properties": {
docs/swagger.json
@@ -46,7 +46,7 @@
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.FinenessRegister"
                                                "$ref": "#/definitions/models.FinenessCheck"
                                            }
                                        }
                                    }
@@ -115,7 +115,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.FinenessRegister"
                                            "$ref": "#/definitions/models.FinenessCheck"
                                        }
                                    }
                                }
@@ -616,6 +616,13 @@
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "name": "keyWord",
                        "in": "query"
                    },
@@ -868,6 +875,75 @@
                }
            }
        },
        "models.FinenessCheck": {
            "type": "object",
            "properties": {
                "averageFineness": {
                    "description": "平均纤度",
                    "type": "number"
                },
                "cleanliness": {
                    "description": "清洁度",
                    "type": "number"
                },
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "deviation": {
                    "description": "偏差",
                    "type": "number"
                },
                "finenessGrade": {
                    "description": "纤度等级",
                    "type": "string"
                },
                "finenessRegister": {
                    "description": "纤度登记",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.FinenessRegister"
                        }
                    ]
                },
                "finenessRegisterID": {
                    "description": "纤度登记表ID",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "inspector": {
                    "description": "检验员",
                    "type": "string"
                },
                "marketProcessOrderNumber": {
                    "description": "庄口工艺单编号",
                    "type": "string"
                },
                "measureFineness": {
                    "description": "公量纤度",
                    "type": "number"
                },
                "purity": {
                    "description": "洁净度",
                    "type": "number"
                },
                "totalDeviation": {
                    "description": "总差",
                    "type": "number"
                },
                "twiceChange": {
                    "description": "二度变化",
                    "type": "number"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.FinenessItem": {
            "type": "object",
            "properties": {
docs/swagger.yaml
@@ -82,6 +82,54 @@
      updatedAt:
        type: string
    type: object
  models.FinenessCheck:
    properties:
      averageFineness:
        description: 平均纤度
        type: number
      cleanliness:
        description: 清洁度
        type: number
      createdAt:
        type: string
      deletedAt:
        $ref: '#/definitions/gorm.DeletedAt'
      deviation:
        description: 偏差
        type: number
      finenessGrade:
        description: 纤度等级
        type: string
      finenessRegister:
        allOf:
        - $ref: '#/definitions/models.FinenessRegister'
        description: 纤度登记
      finenessRegisterID:
        description: 纤度登记表ID
        type: integer
      id:
        type: integer
      inspector:
        description: 检验员
        type: string
      marketProcessOrderNumber:
        description: 庄口工艺单编号
        type: string
      measureFineness:
        description: 公量纤度
        type: number
      purity:
        description: 洁净度
        type: number
      totalDeviation:
        description: 总差
        type: number
      twiceChange:
        description: 二度变化
        type: number
      updatedAt:
        type: string
    type: object
  models.FinenessItem:
    properties:
      createdAt:
@@ -422,7 +470,7 @@
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.FinenessRegister'
                    $ref: '#/definitions/models.FinenessCheck'
                  type: array
              type: object
      summary: 纤度检验列表
@@ -481,7 +529,7 @@
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  $ref: '#/definitions/models.FinenessRegister'
                  $ref: '#/definitions/models.FinenessCheck'
              type: object
      summary: 纤度检验详情
      tags:
@@ -770,6 +818,11 @@
  /api-jl/v1/system/getWorkshopManageList:
    get:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - in: query
        name: keyWord
        type: string
router/router.go
@@ -18,7 +18,7 @@
    r.StaticFS(conf.LocalConf.StorePath, http.Dir(conf.LocalConf.StorePath)) // 为用户头像和文件提供静态地址
    r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
    r.Use(middleware.JWTAuth())
    //r.Use(middleware.JWTAuth())
    //r.Use(middleware.VerifyResetPwd())
    urlPrefix := "/api-jl/v1"