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 61e38ce26..dd97f0171 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 @@ -588,11 +588,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } //空出直接完结指令 if (error == 6) { - //清警 - cleanErro(); Instruction instruction = checkInst(); try { finish_instruction(instruction); + //清警 + cleanErro(); } catch (Exception e) { throw new RuntimeException(e); } @@ -806,7 +806,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme String startDeviceCode = instructionErro.getStart_device_code(); Device startDeviceError = deviceAppService.findDeviceByCode(startDeviceCode); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - pakagePLCData(list, startDeviceError.getExtraValue().get("x").toString(), startDeviceError.getExtraValue().get("y").toString(), startDeviceError.getExtraValue().get("z").toString(), instructionErro.getExecute_code(), instructionErro.getInstruction_code()); + pakagePLCData(list, startDeviceError.getExtraValue().get("x").toString(), startDeviceError.getExtraValue().get("z").toString(), startDeviceError.getExtraValue().get("y").toString(), instructionErro.getExecute_code(), instructionErro.getInstruction_code()); requireSucess = true; return true; } @@ -839,7 +839,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); List list = new ArrayList(); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - pakagePLCData(list, nextDevice.getExtraValue().get("x").toString(), nextDevice.getExtraValue().get("y").toString(), nextDevice.getExtraValue().get("z").toString(), instructionErro.getExecute_code(), instructionErro.getInstruction_code()); + pakagePLCData(list, nextDevice.getExtraValue().get("x").toString(), nextDevice.getExtraValue().get("z").toString(), nextDevice.getExtraValue().get("y").toString(), instructionErro.getExecute_code(), instructionErro.getInstruction_code()); requireSucess = true; return true; }