From 2fa7a06e76567773b7b21cc3a204a7d1f09ec772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Wed, 10 Dec 2025 09:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=BE=93=E9=80=81=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduleTask/ssj/floor2/Floor2InOutSsjThread.java      | 2 --
 .../schedule/scheduleTask/ssj/floor2/LineSsjThread.java    | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

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());
                     }