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"; } /**