From 3e0eb7fd54375ddee03be21c644d5e614437348e Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Sun, 12 May 2024 09:48:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=B3=E8=AF=B7=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8B=E5=8F=91=E5=91=BD=E4=BB=A4=E3=80=81=E5=A0=86?=
 =?UTF-8?q?=E5=9E=9B=E6=9C=BA=E6=8A=A5=E8=AD=A6=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stacker/standard_stacker/StandardStackerDeviceDriver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dc43aa8ce..733fa67a4 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
@@ -805,7 +805,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         } else {
             //维修解警后重新向堆垛机下发指令
             Instruction instructionErro = checkInst();
-            if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){
+            if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())&& StrUtil.isNotEmpty(instructionErro.getExecute_code())){
                 List list = new ArrayList();
                 pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task);
                 return  true;