diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 5d43e1295..87d27db3e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -376,7 +376,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme case 0: boolean b = applyTask(); if (b) { - if (updateCommand("0")) break; requireSucess = false; } break; @@ -801,12 +800,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme return false; } else { //维修解警后重新向堆垛机下发指令 - Instruction instructionErro = checkInst(); - if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){ - List list = new ArrayList(); - pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task); - return true; - } +// Instruction instructionErro = checkInst(); +// if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){ +// List list = new ArrayList(); +// pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task); +// return true; +// } this.instruction_require_time = date; //输入:指令类型多种\ 指令状态多种\