执行阶段

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

@@ -8,46 +8,42 @@ public class TaskStatusCode {
     /**
      * 任务状态-待执行
      */
-    public static final String TASK_READY = "0";
+    public static final String TASK_STATUS_CREATE = "1";
 
     /**
-     * 任务状态-（向设备）请求下发任务成功
+     * 任务状态-待执行
      */
-    public static final String TASK_SEND_SUCCESS = "1";
+    public static final String TASK_STATUS_PENDING = "2";
 
     /**
-     * 任务状态-已创建（设备请求成功）
+     * 任务状态-正执行
      */
-    public static final String TASK_CREATED = "100";
+    public static final String TASK_STATUS_RUNNING = "3";
 
     /**
-     * 任务状态-执行中
+     * 任务状态-已完成
      */
-    public static final String TASK_RUNNING = "101";
+    public static final String TASK_STATUS_FINISH = "4";
 
     /**
-     * 任务状态-自动完成
+     * 任务状态-作废
      */
-    public static final String TASK_FINISH = "102";
+    public static final String TASK_STATUS_INVALID = "5";
-
     /**
-     * 任务状态-手动完成
+     * 任务执行阶段 AGV
      */
-    public static final String TASK_FINISH_MANUAL = "103";
+    public static final String TASK_EP_AGV = "1";
-
     /**
-     * 任务状态-已取消
+     * 任务执行阶段 堆垛机
      */
-    public static final String TASK_CANCEL = "104";
+    public static final String TASK_EP_SSJ = "2";
-
     /**
-     * 任务状态-手动取消
+     * 任务执行阶段 巷道口
      */
-    public static final String TASK_CANCEL_MANUAL = "105";
+    public static final String TASK_EP_ROADWAY_SSJ = "3";
-
     /**
-     * 任务状态-手动取消
+     * 任务执行阶段 输送机
      */
-    public static final String TASK_INTERUPTED = "109";
+    public static final String TASK_EP_DDJ = "4";
 
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java

@@ -157,6 +157,7 @@ public class Floor1BothWayInSsjThread implements Runnable {
                 if (StrUtil.isNotEmpty(ssj.getTrayCode())) {
                     MydoJob param = new MydoJob();
                     param.setStatus("3");
+                    param.setExecutionPhase("0");
                     if ("L2005".equals(ssj.getDeviceCode())) {
                         param.setEntranceId("L2013");
                     }else {

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java

@@ -22,6 +22,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
 
+import static com.ruoyi.common.TaskStatusCode.TASK_EP_DDJ;
+import static com.ruoyi.common.TaskStatusCode.TASK_STATUS_RUNNING;
 import static com.ruoyi.common.TaskType.DDJ_RWLX_2;
 
 /**
@@ -170,6 +172,12 @@ public class Floor1SingleSsjThread implements Runnable {
                         ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
                         ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_2);
                         ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
+
+                        //修改作业状态
+                        mydoJob.setStatus(TASK_STATUS_RUNNING);
+                        mydoJob.setExecutionPhase(TASK_EP_DDJ);
+                        mydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
+                        mydoJobService.updateMydoJob(mydoJob);
                     }
                 }
             }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java

@@ -113,7 +113,7 @@ public class LineSsjThread implements Runnable {
                 paramMap.put("trayCode", SsjDevice.getTrayCode());
                 paramMap.put("size", SsjDevice.getTraySize());
                 paramMap.put("floor", "2");
-                paramMap.put("extranceId", "G1005");
+                paramMap.put("entranceId", "G1005");
                 AjaxResult ajaxResult = apiService.createInMydoJob(paramMap);
                 if (ajaxResult.isSuccess()) {
                     //拿到正常作业，插到wcs作业表，下发给输送机任务号，覆盖任务号

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
         and in_or_out > 20
+        and status = 1
         order by priority desc,create_time desc
     </select>