diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 22b41ed55..d705ac911 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -130,7 +130,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i this.setRequireSucess(false); message = null; logServer.deviceExecuteLog(this.device_code, "", "", "信号复位后requireSuccess:" + requireSucess); - } logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode:" + last_mode + "->" + mode); @@ -195,8 +194,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i int action = hongXiangConveyorDeviceDriver.getAction(); int error1 = hongXiangConveyorDeviceDriver.getError1(); if (mode == 1 && door == 1 && action == 1 && error1 == 0) { - this.writing("to_command", "2"); - this.setNow_steps_type(3); + if (this.getNow_steps_type() == 2) { + this.writing("to_command", "2"); + this.setNow_steps_type(3); + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号(now_steps_type!=2)"); + } } else { if (this.getNow_steps_type() == 2) { feedMessage = "烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code(); @@ -215,8 +218,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } } else { - this.writing("to_command", "2"); - this.setNow_steps_type(3); + if (this.getNow_steps_type() == 2) { + this.writing("to_command", "2"); + this.setNow_steps_type(3); + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号(now_steps_type!=2)\")"); + } } } } else { @@ -248,8 +255,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver(); hongXiangConveyorDeviceDriver.writing("to_close_door", "1"); } - this.writing("to_command", "3"); - this.setNow_steps_type(4); + if (this.getNow_steps_type() == 3) { + this.writing("to_command", "3"); + this.setNow_steps_type(4); + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许取货(now_steps_type!=3)"); + } } } else { if (this.getNow_steps_type() == 3) { @@ -283,8 +294,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i int action = hongXiangConveyorDeviceDriver.getAction(); int error1 = hongXiangConveyorDeviceDriver.getError1(); if (mode == 1 && door == 1 && action == 1 && error1 == 0) { - this.writing("to_command", "4"); - this.setNow_steps_type(5); + if (this.getNow_steps_type() == 4) { + this.writing("to_command", "4"); + this.setNow_steps_type(5); + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货(now_steps_type!=4)"); + } } else { feedMessage = "烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code(); if (mode != 1) { @@ -301,8 +316,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } } else { - this.writing("to_command", "4"); - this.setNow_steps_type(5); + if (this.getNow_steps_type() == 4) { + this.writing("to_command", "4"); + this.setNow_steps_type(5); + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货(now_steps_type!=4)"); + } } } else { if (this.getNow_steps_type() == 4) { @@ -355,10 +374,14 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i hongXiangConveyorDeviceDriver.writing("to_time_min", String.valueOf(minutes)); } } - this.writing("to_command", "5"); - this.setNow_steps_type(6); - this.setNow_steps_type(0); - feedMessage = ""; + if (this.getNow_steps_type() == 5) { + this.writing("to_command", "5"); + this.setNow_steps_type(6); + this.setNow_steps_type(0); + feedMessage = ""; + } else { + logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为放货完成(now_steps_type!=5)"); + } // this.writing("to_onset", "0"); // this.writing("to_target", "0"); // this.writing("to_task", "0");