输送机退回重进清除当前作业

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 = "";