diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index ea5398420..853600f67 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -216,6 +216,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme requireSucess = false; requireEmptyInSuccess = false; } + } else if (StrUtil.equals(this.device_code, "1016")) { + if (mode == 8 && last_mode == 2) { + requireSucess = false; + requireEmptyInSuccess = false; + } } else { requireSucess = false; requireEmptyInSuccess = false; @@ -748,8 +753,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", "1"); list.add(map3); this.writing(list); - while(!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer()+"."+this.getOpcPlc()+"."+this.getDevice_code()+".task").toString() - ,instdto.getInstruction_code())){ + while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString() + , instdto.getInstruction_code())) { this.writing(list); logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); try { @@ -790,8 +795,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", "1"); list.add(map3); this.writing(list); - while(!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer()+"."+this.getOpcPlc()+"."+this.getDevice_code()+".task").toString() - ,inst.getInstruction_code())){ + while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString() + , inst.getInstruction_code())) { this.writing(list); logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); try {