diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 21557324a..2f8827f57 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -837,17 +837,14 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple flag = checkAgv(task); if (flag) { break; + }else { + task =null; + continue; } - if (!flag && j == taskDtoList.size() - 1) { - notCreateInstMessage = "rgv条件不匹配" + "任务号为:" + task.getTask_code(); - return false; - } - } else { - break; - } + } // 9 行架任务 - if (!StrUtil.equals(task.getTask_type(), "9")) { + if (ObjectUtil.isNotEmpty(task) && !StrUtil.equals(task.getTask_type(), "9")) { task = null; 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)) { return true; } else { + log.info("rgv条件不符合"); logServer.deviceExecuteLog(device_code, "", "", "rgv条件不符合"); }