root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 还原区域

Browse Source
This commit is contained in:
liyongde
2026-08-15 10:59:06 +08:00
parent b79e753671
commit 444eea777b
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
View File

@@ -195,7 +195,7 @@ public class AutoSendAirShaftAgvTask {
List<BstIvtCutpointivt> emptyPoint = slitterMapper.getEmptyAirShaftAgvPointNotTask( List<BstIvtCutpointivt> emptyPoint = slitterMapper.getEmptyAirShaftAgvPointNotTask(
area, area,
SlitterTaskUtil.getPointLocationInCutDeviceXn( SlitterTaskUtil.getPointLocationInCutDeviceXn(
SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()), area), SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name())),
deviceCut.getPlan()); deviceCut.getPlan());
if (emptyPoint.isEmpty()) { if (emptyPoint.isEmpty()) {
log.warn("当前分切机找不到空闲的对接位置！"); log.warn("当前分切机找不到空闲的对接位置！");

14
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
View File

@@ -353,18 +353,8 @@ public class SlitterTaskUtil {
return "1"; return "1";
} }
public static String getPointLocationInCutDeviceXn(int num, String area) { public static String getPointLocationInCutDeviceXn(int num) {
if (area.equals(B1_AREA_CODE)) { return num <= 2 ? "0" : "1";
if (num <= 2) {
return "0";
}
}
if (area.equals(B2_AREA_CODE)) {
if (num > 2) {
return "0";
}
}
return "1";
} }
/** /**