From b36299dd56523092909239b1f77977315618fdb0 Mon Sep 17 00:00:00 2001 From: LENOVO <1793460677@qq.com> Date: Wed, 8 May 2024 17:16:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A0=86=E5=9E=9B=E6=9C=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=83=85=E5=86=B5=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardStackerDeviceDriver.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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; //输入:指令类型多种\ 指令状态多种\