zhangqian
2023-09-28 e8b6ad0c160a39b024b0f2b996d603bdd9b22db9
工艺参数列表增加是否可以更新字段
7个文件已修改
61 ■■■■■ 已修改文件
api/v1/process_model.go 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.json 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.yaml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
model/process_model.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
model/request/task.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/process_model.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/v1/process_model.go
@@ -23,10 +23,28 @@
    if !ok {
        return
    }
    procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
    if code != ecode.OK {
        ctx.Fail(code)
        return
    }
    order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
    if err != nil {
        ctx.Fail(ecode.DBErr)
        return
    }
    list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
    if err != nil {
        ctx.Fail(ecode.DBErr)
        return
    }
    for _, processModel := range list {
        if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
            processModel.IsUpdate = processModel.Number != params.Number
        }
    }
    ctx.ResultList(list, total)
}
docs/docs.go
@@ -377,6 +377,13 @@
                "summary": "获取工艺模型列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "当前正在使用的工艺参数编号",
                        "name": "number",
                        "in": "query",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
@@ -387,6 +394,13 @@
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "当前的工序id",
                        "name": "procedureId",
                        "in": "query",
                        "required": true
                    }
                ],
                "responses": {
docs/swagger.json
@@ -365,6 +365,13 @@
                "summary": "获取工艺模型列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "当前正在使用的工艺参数编号",
                        "name": "number",
                        "in": "query",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
@@ -375,6 +382,13 @@
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "当前的工序id",
                        "name": "procedureId",
                        "in": "query",
                        "required": true
                    }
                ],
                "responses": {
docs/swagger.yaml
@@ -651,6 +651,11 @@
  /v1/processModel/list:
    get:
      parameters:
      - description: 当前正在使用的工艺参数编号
        in: query
        name: number
        required: true
        type: string
      - description: 页码
        in: query
        name: page
@@ -659,6 +664,11 @@
        in: query
        name: pageSize
        type: integer
      - description: 当前的工序id
        in: query
        name: procedureId
        required: true
        type: integer
      produces:
      - application/json
      responses:
model/process_model.go
@@ -19,6 +19,7 @@
        ParamsMap  map[string]interface{} `json:"paramsMap" gorm:"-"`
        DeviceId   string                 `json:"deviceId" gorm:"-"`                        //用于过滤获取nsq消息
        IsNew      bool                   `json:"isNew" gorm:"column:is_new;comment:是否最新的"` //是否最新的
        IsUpdate   bool                   `json:"isUpdate" gorm:"-"`                        //前端用
    }
    ProcessModelSearch struct {
model/request/task.go
@@ -30,4 +30,6 @@
// ProcessModelList 工艺参数列表请求参数
type ProcessModelList struct {
    PageInfo
    ProcedureId int    `json:"procedureId" form:"procedureId" binding:"required"` //当前的工序id
    Number      string `json:"number" form:"number"  binding:"required"`          //当前正在使用的工艺参数编号
}
service/process_model.go
@@ -11,7 +11,7 @@
        return
    }
    list, total, err = model.NewProcessModelSearch().
        SetIsNew(true).
        SetIsNew(true).SetOrder("id desc").
        SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
    return
}