zhangqian
2023-11-13 314bb7656d139fe3a64e05e696dbc428091ffe04
当设置了跳过工艺参数时,工艺参数列表不再报错
1个文件已修改
17 ■■■■ 已修改文件
api/v1/task.go 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/v1/task.go
@@ -153,15 +153,22 @@
    var processModel *model.ProcessModel
    if procedure.ProcessModelNumber != "" {
        processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
        if err != nil || processModel == nil || processModel.ParamsMap == nil {
            ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数,请在工艺模型库中上传!")
            return
        }
    } else {
        processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
        if err != nil || processModel == nil || processModel.ParamsMap == nil {
    }
    if err != nil || processModel == nil || processModel.ParamsMap == nil {
        device, err := service.GetCurrentDevice()
        if err != nil {
            ctx.FailWithMsg(ecode.UnknownErr, err.Error())
            return
        }
        if device.NeedSetProcessParams {
            ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数,请在工艺模型库中上传!")
            return
        } else {
            ctx.OkWithDetailed(response.ProcessParamsResponse{})
            return
        }
    }