按是否需求设置工艺参数的配置决定是否下发工艺参数

zhangqian

2023-11-09 2cee8ad3ed7324dbf8e88f3d167c859aa8070b8a

按是否需求设置工艺参数的配置决定是否下发工艺参数

 api/v1/task.go

@@ -284,6 +284,7 @@
        ctx.FailWithMsg(ecode.DBErr, err.Error())
        return
    }
    var processModelNumber string
    if device.NeedSetProcessParams {
        processModel, err := taskService.GetProcessParams(procedure, order)
        if err != nil || processModel == nil || processModel.ParamsMap == nil {
@@ -295,6 +296,7 @@
            ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
            return
        }
        processModelNumber = processModel.Number
    }

    plcConfig.CurrentTryTimes = 0
@@ -304,7 +306,7 @@
        return
    }
    err = model.WithTransaction(func(db *gorm.DB) error {
        err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
        err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
        if err != nil {
            return err
        }