首次报工开始时间为工序开始时间

zhangqian

2023-11-29 28addaa46cb97c20ad37e13eb10535de7b75e71c

 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,12 @@
         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,
      }
      return service.NewTaskService().SaveTaskStatusSync(db, &record)
   })
@@ -268,6 +272,10 @@
      ctx.Fail(code)
      return
   }
   if procedure.DeviceID != conf.Conf.CurrentDeviceID {
      ctx.FailWithMsg(ecode.ParamsErr, "该任务不属于当前设备")
      return
   }
   order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
   if err != nil {
      ctx.Fail(ecode.UnknownErr)
@@ -281,7 +289,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 {
@@ -324,11 +332,12 @@
         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)
   })