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 3524b7b53..e3b863de9 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 @@ -489,7 +489,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme break; case 6: message = "one_message2"; - if (updateCommand("6")) break; Map map1 = new HashMap<>(); map1.put("code", "to_command"); map1.put("value", 6); @@ -498,7 +497,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme break; case 7: message = "one_message3"; - if (updateCommand("7")) break; Map map2 = new HashMap<>(); map2.put("code", "to_command"); map2.put("value", 7); @@ -507,7 +505,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme break; case 8: message = "one_message4"; - if (updateCommand("8")) break; Map map3 = new HashMap<>(); map3.put("code", "to_command"); map3.put("value", 8); @@ -805,7 +802,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } else { //维修解警后重新向堆垛机下发指令 Instruction instructionErro = checkInst(); - if (InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){ + if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){ List list = new ArrayList(); pakagePLCData(list, String.valueOf(x),String.valueOf(y),String.valueOf(z),instructionErro.getExecute_code(),task); return true;