未设置plc允许开始任务

zhangqian

2023-11-25 2f225f5b9ce679e641cdb73b74b41b500921ef02

 api/v1/task.go

@@ -279,39 +279,37 @@
      return
   }

   plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
   if code != ecode.OK || plcConfig.ID == 0 {
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "请先配置PLC")
      return
   }
   plcConfig.MaxTryTimes = 2

   device, err := service.GetCurrentDevice()
   if err != nil {
      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 {
         ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数，请在工艺模型库中上传！")
   plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
   if code == ecode.OK && plcConfig.ID != 0 {
      plcConfig.MaxTryTimes = 2
      device, err := service.GetCurrentDevice()
      if err != nil {
         ctx.FailWithMsg(ecode.DBErr, err.Error())
         return
      }
      err = SendParams(processModel.ParamsMap, plcConfig)
      if device.NeedSetProcessParams {
         processModel, err := taskService.GetProcessParams(procedure, order)
         if err != nil || processModel == nil || processModel.ParamsMap == nil {
            ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数，请在工艺模型库中上传！")
            return
         }
         err = SendParams(processModel.ParamsMap, plcConfig)
         if err != nil {
            ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
            return
         }
         processModelNumber = processModel.Number
      }

      plcConfig.CurrentTryTimes = 0
      err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
      if err != nil {
         ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
         return
      }
      processModelNumber = processModel.Number
   }

   plcConfig.CurrentTryTimes = 0
   err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
   if err != nil {
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
      return
   }
   err = model.WithTransaction(func(db *gorm.DB) error {
      err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
      if err != nil {