优化调整

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

@@ -2,6 +2,8 @@ package com.ruoyi.job.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +16,9 @@ import com.ruoyi.job.service.IMydoJobService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import static com.ruoyi.common.TaskStatusCode.TASK_EP_DDJ_FINISH;
+import static com.ruoyi.common.TaskStatusCode.TASK_EP_SSJ_STOCKOUT_FINISH;
+
 /**
  * 作业信息Controller
  *
@@ -114,4 +119,23 @@ public class MydoJobController extends BaseController
     {
         return mydoJobService.OuthandFinish(jobIds);
     }
+
+
+    /**
+     * 处理未正常移除的【堆垛机执行完成】或【出库到位】的遗留任务
+     */
+    @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()));
+            }
+        }
+    }
+
 }