From f2ae4b8670de86e1e3886cee26f57e8a9bc4ffbe Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 3 Jun 2025 09:14:51 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E9=87=8D=E5=A4=8D=E5=A5=97=E8=BD=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/auto/AutoCallAirShaftTask.java    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index c971a5437..706725e4c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -855,6 +855,7 @@ public class AutoCallAirShaftTask extends Prun {
         if (tasks.size() == 0) {
             return true;
         }
+        stepErrorInfo.add("存在为" + dto.getResource_name() + "送轴任务，不会继续套轴...");
         log.info("存在任务，不允许套轴{}", dto);
         stepStr += ",5";
         return false;
@@ -881,20 +882,10 @@ public class AutoCallAirShaftTask extends Prun {
                         ? shafttubeivt.getContainer_name1() : shafttubeivt.getContainer_name2();
                 // 获取这个子卷号的分切计划
                 PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName(containerCode);
-                if ("1".equals(byContainerName.getOrder_type())) {
-                    // 判断母卷
-                    if (byContainerName.getParent_container_name().equals(dto.getParent_container_name())) {
-                        stepStr += ",4";
-                        stepErrorInfo.add(">>>穿拔轴机已经在为" + dto.getResource_name() + "套轴了...");
-                        return false;
-                    }
-                } else {
-                    // 判断改切
-                    if (byContainerName.getRestruct_container_name().equals(dto.getParent_container_name())) {
-                        stepStr += ",4";
-                        stepErrorInfo.add(">>>穿拔轴机已经在为" + dto.getResource_name() + "套轴了...");
-                        return false;
-                    }
+                if (byContainerName.getResource_name().equals(dto.getResource_name())) {
+                    stepStr += ",4";
+                    stepErrorInfo.add(">>>穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
+                    return false;
                 }
             }
             // 校验是否在拔轴暂存位、分切对接位有相同设备的分切计划信息。