From 6684e18725d06fb9c46f752830190332206a9136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 12 Dec 2025 09:52:06 +0800
Subject: [PATCH] 123

---
 .../schedule/scheduleTask/ssj/floor2/LineSsjThread.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 03ccee5..766e591 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
@@ -99,15 +99,16 @@ public class LineSsjThread implements Runnable {
             //查作业，入如果已经有了，直接下发输送线
             MydoJob mydoJob = new MydoJob();
             mydoJob.setInOrOut("1");
-//            mydoJob.setStatus("1");
+            String[] split = SsjDevice.getTrayCode().split(" ");
+            String serial = split[2].substring(7);
+            mydoJob.setTrayCode(serial);
             mydoJob.setEntranceId("G1005");
-//            mydoJob.setExecutionPhase("0");
             List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob);
             //有作业，下发输送机任务号，覆盖任务号
             if (!mydoJobs.isEmpty()) {
                //永远有且只有一条
                 mydoJob = mydoJobs.get(0);
-                if(mydoJob.getStatus().equals("1")&& mydoJob.getExecutionPhase().equals("0")) {
+                if(mydoJob.getStatus().equals("1")) {
                     int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob.getTaskNo(), 1, 1);
                     if (i == 1) {
                         mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ);