diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java index c7ed7d4..4af6b9c 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java @@ -193,6 +193,10 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im Instruction instruction = null; List toInstructions; + if (mode == 2){ + requireSucess = false; + } + switch (mode) { case 1: log.debug("设备运转模式:等待工作"); @@ -204,14 +208,18 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im message = "起点终点为空"; break; } - applyTask(); + if (!requireSucess) { + applyTask(); + } break; //取消 case 4: if (task == 0){ break; } - this.cancle_require(); + + this.cancle_require(); + break; } @@ -271,6 +279,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + requireSucess = true; } }