From 9ff24e009523cbdb0d9f2d4469befdefb6121622 Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Tue, 7 May 2024 14:20:30 +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=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard_stacker/StandardStackerDeviceDriver.java        | 5 +----
 1 file changed, 1 insertion(+), 4 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 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<String, Object> 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<String, Object> 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<String, Object> 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;