diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java index 4fb3c7d6..e594c067 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java @@ -110,7 +110,6 @@ public class Floor2InOutSsjThread implements Runnable { agvQueueService.updateAgvQueue(agvQueues.get(0)); } } - } //入库下发输送线 if (inSsjDevice.getKx() == 0 && inSsjDevice.getTaskNo() == 0) { @@ -129,7 +128,6 @@ public class Floor2InOutSsjThread implements Runnable { agvQueueService.deleteAgvQueueByReqCode(agvQueues.get(0).getReqCode()); } } - } //出库到位 if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java index 24bf02bb..458c523d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java @@ -103,7 +103,7 @@ public class LineSsjThread implements Runnable { mydoJob = mydoJobs.get(0); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1); if (i == 1) { - //mydoJob.setExecutionPhase(TASK_EP_AGV); + mydoJob.setExecutionPhase(TASK_EP_AGV); mydoJobService.updateMydoJob(mydoJob); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); } @@ -128,7 +128,7 @@ public class LineSsjThread implements Runnable { mydoJobService.insertMydoJob(mydoJob2); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1); if (i == 1) { - //mydoJob2.setExecutionPhase("1"); + mydoJob2.setExecutionPhase(TASK_EP_AGV); mydoJobService.updateMydoJob(mydoJob2); log.info("G1005产线输送机下发任务号成功:{}" , mydoJob2.getTaskNo()); } @@ -161,6 +161,7 @@ public class LineSsjThread implements Runnable { mydoJob = mydoJobs.get(0); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1); if (i == 1) { + mydoJob.setExecutionPhase(TASK_EP_AGV); mydoJobService.updateMydoJob(mydoJob); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); } @@ -174,7 +175,7 @@ public class LineSsjThread implements Runnable { mydoJobService.insertMydoJob(mydoJob2); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1); if (i == 1) { - mydoJob2.setExecutionPhase("1"); + mydoJob2.setExecutionPhase(TASK_EP_AGV); mydoJobService.updateMydoJob(mydoJob2); log.info("G1005产线输送机下发任务号成功:" + mydoJob2.getTaskNo()); }