From 444eea777bb8646f135346f57e9fcf88787ab4f8 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 15 Aug 2026 10:59:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/auto/AutoSendAirShaftAgvTask.java | 2 +- .../sch/tasks/slitter/util/SlitterTaskUtil.java | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java index 3228e1374..cdf09d5b4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java @@ -195,7 +195,7 @@ public class AutoSendAirShaftAgvTask { List emptyPoint = slitterMapper.getEmptyAirShaftAgvPointNotTask( area, SlitterTaskUtil.getPointLocationInCutDeviceXn( - SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()), area), + SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name())), deviceCut.getPlan()); if (emptyPoint.isEmpty()) { log.warn("当前分切机找不到空闲的对接位置!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index dee0eac0d..75e794723 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -353,18 +353,8 @@ public class SlitterTaskUtil { return "1"; } - public static String getPointLocationInCutDeviceXn(int num, String area) { - if (area.equals(B1_AREA_CODE)) { - if (num <= 2) { - return "0"; - } - } - if (area.equals(B2_AREA_CODE)) { - if (num > 2) { - return "0"; - } - } - return "1"; + public static String getPointLocationInCutDeviceXn(int num) { + return num <= 2 ? "0" : "1"; } /**