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

fix:内包间行架rgv问题修复

Browse Source
This commit is contained in:
lishuai
2023-12-27 16:51:41 +08:00
parent 09b420978c
commit f1e4d5f3f8
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -837,17 +837,14 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
flag = checkAgv(task); flag = checkAgv(task);
if (flag) { if (flag) {
break; break;
}
if (!flag && j == taskDtoList.size() - 1) {
notCreateInstMessage = "rgv条件不匹配" + "任务号为：" + task.getTask_code();
return false;
}
}else { }else {
break; task =null;
continue;
} }
}
// 9 行架任务 // 9 行架任务
if (!StrUtil.equals(task.getTask_type(), "9")) { if (ObjectUtil.isNotEmpty(task) && !StrUtil.equals(task.getTask_type(), "9")) {
task = null; task = null;
continue; continue;
} }
@@ -969,6 +966,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
if ((rgv1.getMode() == 2 && rgv1.getMove1() == 1 && rgv1.getMove2() == 0) || (rgv2.getMode() == 2 && rgv2.getMove1() == 1 && rgv2.getMove2() == 0)) { if ((rgv1.getMode() == 2 && rgv1.getMove1() == 1 && rgv1.getMove2() == 0) || (rgv2.getMode() == 2 && rgv2.getMove1() == 1 && rgv2.getMove2() == 0)) {
return true; return true;
} else { } else {
log.info("rgv条件不符合");
logServer.deviceExecuteLog(device_code, "", "", "rgv条件不符合"); logServer.deviceExecuteLog(device_code, "", "", "rgv条件不符合");
} }