联合查表优化

ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java

@@ -57,7 +57,7 @@ public class TaskStatusCode {
     public static final String TASK_EP_AGV = "2";
 
     /**
-     * 任务执行阶段 入口输送机
+     * 任务执行阶段 入口输送机输送到位
      */
     public static final String TASK_EP_SSJ = "3";
 
@@ -89,7 +89,7 @@ public class TaskStatusCode {
     /**
      * 任务执行阶段 任务超时-自动结束当前任务
      */
-    public static final String TASK_EP_DDJ_FINISH_TIMEOUT = "6_TIMEOUT_FINISH";
+    public static final String TASK_EP_DDJ_FINISH_TIMEOUT = "6";
 
     /**
      * 入库异常 - 放货有货

ruoyi-ui/src/views/job/mydoJob/index.vue

@@ -285,7 +285,7 @@ export default {
     getList() {
       this.loading = true
       
-      listMydoJobFinish(this.queryParams).then(response => {
+      listMydoJobUnion(this.queryParams).then(response => {
           this.mydoJobList = response.rows
           this.total = response.total
           this.loading = false