往plc写目标数时，优先往写入地址写，没有写入地址再往读取地址写

zhangqian

2023-12-13 20bbbcc1d14536ddaa498ac84a6008828df8dc1c

 api/v1/task.go

@@ -228,11 +228,13 @@
         return err
      }
      record := model.TaskStatusSync{
         WorkOrderId:  procedure.WorkOrderID,
         ProcedureID:  procedure.ProcedureID,
         DeviceId:     procedure.DeviceID,
         IsProcessing: false,
         IsFinish:     true,
         WorkOrderId:        procedure.WorkOrderID,
         ProcedureID:        procedure.ProcedureID,
         DeviceId:           procedure.DeviceID,
         ProductProcedureID: procedure.ProductProcedureID,
         IsProcessing:       false,
         IsFinish:           true,
         FinishedQuantity:   procedure.FinishedQuantity,
      }
      return service.NewTaskService().SaveTaskStatusSync(db, &record)
   })
@@ -309,8 +311,14 @@
         processModelNumber = processModel.Number
      }

      fieldType := constvar.PlcStartAddressTypeTotalNumber
      for _, pc := range plcConfig.Details { //如果有写入地址，优先往写入地址写入，没有的话往读取地址写入
         if pc.FieldName == constvar.PlcStartAddressTypeTotalNumberWrite && pc.Channel == procedure.Channel {
            fieldType = constvar.PlcStartAddressTypeTotalNumberWrite
         }
      }
      plcConfig.CurrentTryTimes = 0
      err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
      err = service.PlcWrite(plcConfig, fieldType, procedure.Channel, order.Amount.IntPart())
      if err != nil {
         ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
         return
@@ -326,16 +334,13 @@
      if err != nil {
         return err
      }
      err = service.NewProgressService().Add(db, procedure, order)
      if err != nil {
         return err
      }
      record := model.TaskStatusSync{
         WorkOrderId:  procedure.WorkOrderID,
         ProcedureID:  procedure.ProcedureID,
         DeviceId:     procedure.DeviceID,
         IsProcessing: true,
         IsFinish:     false,
         WorkOrderId:        procedure.WorkOrderID,
         ProcedureID:        procedure.ProcedureID,
         DeviceId:           procedure.DeviceID,
         ProductProcedureID: procedure.ProductProcedureID,
         IsProcessing:       true,
         IsFinish:           false,
      }
      return service.NewTaskService().SaveTaskStatusSync(db, &record)
   })