From 6404fd8de9ff1aed058e1d63c8a30866b9fffe02 Mon Sep 17 00:00:00 2001
From: lsymicc <e003914@163.com>
Date: Sat, 9 May 2026 16:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81=E6=9C=BA=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9B=E6=B8=85=E9=99=A4=E5=BD=93=E5=89=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/scheduleTask/ssj/PortConvThread.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
index 6730899..5b12449 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
@@ -162,7 +162,16 @@ public class PortConvThread implements Runnable {
         int count = mydoJobService.selectInOrOutMydoJobList(
                 new MydoJob().builder().trayCode(inSsjDevice.getTrayCode()).build()
         ).size();
-        if (count > 0) return;
+
+        if (count > 0) {
+            //如果查到输送机有已经该条码的入库作业 - 删除该作业，重新执行生成请求
+            // 省去入库输送机口的手动作废操作，自动作废并生成新任务
+            mydoJobService.deleteMydoJobByJobId(
+                    new MydoJob().builder().trayCode(inSsjDevice.getTrayCode()).build().getJobId()
+            );
+        }
+
+
 
         String errorMessage = "";