diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java index c5f53fb..2dce6ba 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java @@ -143,7 +143,11 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi io_action = this.itemProtocol.getIoAction(); if (mode != last_mode) { - this.setRequireSucess(false); + if(last_mode != 0 && mode !=0 ){ + this.setRequireSucess(false); + this.execute_log.setResource(this.device_code, this.device.getDevice_name()); + this.execute_log.log("设备:" + device_code + ",last_mode=" + last_mode +"复位请求标记"); + } this.execute_log.setResource(this.device_code, this.device.getDevice_name()); this.execute_log.log("设备:" + device_code + ",last_mode -> mode:" + last_mode + "->" + mode); } @@ -410,6 +414,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; } @@ -476,6 +481,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; } @@ -550,6 +556,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi JSONObject json = JSONObject.fromObject(dto); wo.insert(json); this.setRequireSucess(true); + this.writing(1,this.mode); return true; } } @@ -659,6 +666,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; } @@ -736,6 +744,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; } @@ -808,6 +817,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; } @@ -880,6 +890,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi JSONObject json = JSONObject.fromObject(dto); wo.insert(json); this.setRequireSucess(true); + this.writing(1,this.mode); return true; } } @@ -978,6 +989,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = JSONObject.fromObject(dto); wo.insert(json); + this.writing(1,this.mode); this.setRequireSucess(true); return true; }