优化调整

ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java

@@ -104,10 +104,5 @@ public class JobCallBackController extends BaseController
         return toAjax(jobCallBackService.deleteJobCallBackByIds(ids));
     }
 
-    @Scheduled(fixedDelay=3000)
-    public void jobCallBack() {
-    	jobCallBackService.jobCallBack();
-    }
-
 
 }

ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java

@@ -121,21 +121,4 @@ public class MydoJobController extends BaseController
     }
 
 
-    /**
-     * 处理未正常移除的【堆垛机执行完成】或【出库到位】的遗留任务
-     */
-    @Scheduled(fixedDelay = 3000)
-    public void mydoJobHandler() {
-        //此处堆垛机执行完成-【TASK_EP_DDJ_FINISH】或出库到位-【TASK_EP_SSJ_STOCKOUT_FINISH】的常量值相同，均可表示任务【已完成】
-        //用其中一种状态查询所有标记为【已完成】的任务
-        List<MydoJob> jobs = mydoJobService.selectMydoJobList(
-                new MydoJob().builder().executionPhase(TASK_EP_DDJ_FINISH).build()
-        );
-        if (!jobs.isEmpty()) {
-            for (MydoJob job : jobs) {
-                mydoJobService.taskFinish(Long.valueOf(job.getTaskNo()));
-            }
-        }
-    }
-
 }

ruoyi-admin/src/main/java/com/ruoyi/job/domain/JobCallBack.java

@@ -50,5 +50,9 @@ public class JobCallBack extends BaseEntity
     @Excel(name = "wms任务编号")
     private String taskCode;
 
+    /** 回传重试次数 */
+    @Excel(name = "重试次数")
+    private int retry;
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java

@@ -121,6 +121,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService
                 jobCallBack.setStatus("1");
             }else{
                 jobCallBack.setStatus("99");
+                jobCallBack.setRetry(jobCallBack.getRetry() + 1);
             }
             jobCallBackMapper.updateJobCallBack(jobCallBack);
         }