fix: 还原区域
This commit is contained in:
@@ -195,7 +195,7 @@ public class AutoSendAirShaftAgvTask {
|
||||
List<BstIvtCutpointivt> emptyPoint = slitterMapper.getEmptyAirShaftAgvPointNotTask(
|
||||
area,
|
||||
SlitterTaskUtil.getPointLocationInCutDeviceXn(
|
||||
SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()), area),
|
||||
SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name())),
|
||||
deviceCut.getPlan());
|
||||
if (emptyPoint.isEmpty()) {
|
||||
log.warn("当前分切机找不到空闲的对接位置!");
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user