fix

zhangqian

2023-12-01 8324f872ef3a4d0c978a9b1d062800c6a1701c12

 api/v1/task.go

@@ -108,6 +108,9 @@
   nowTs := time.Now().Unix()
   flagMap := make(map[int32]struct{}, 0)
   for _, task := range taskResponse.Tasks {
      if task.Procedure.Status != model.ProcedureStatusWaitProcess {
         continue
      }
      if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
         task.CanStarted = true
         flagMap[task.Channel] = struct{}{}
@@ -225,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)
   })
@@ -285,7 +290,7 @@

   var processModelNumber string
   plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
   if code == ecode.OK && plcConfig.ID != 0 {
   if code == ecode.OK && plcConfig.ID != 0 && len(plcConfig.Details) > 0 {
      plcConfig.MaxTryTimes = 2
      device, err := service.GetCurrentDevice()
      if err != nil {
@@ -323,16 +328,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)
   })