From 28c02b328ce6f12cad8d8e4daab8839d0f946e23 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Fri, 24 Nov 2023 15:36:28 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=A0=87=E5=87=86=E7=89=88-=E5=8D=95?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=A0=86=E5=9E=9B=E6=9C=BA=E9=A9=B1=E5=8A=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/device/domain/Device.java | 15 -----------
 .../StandardStackerDeviceDriver.java          | 25 ++++++++++++++-----
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java
index 7311ae1..92fbae3 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java
@@ -58,21 +58,6 @@ public class Device  implements Serializable {
     @TableField(exist = false)
     private String device_type_name;
 
-    /**
-     * 排
-     */
-    private String x;
-
-    /**
-     * 列
-     */
-    private String y;
-
-    /**
-     * 层
-     */
-    private String z;
-
     @TableField(exist = false)
     private String region_name;
 
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java
index 8577cc2..15688de 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java
@@ -228,6 +228,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             if (!command.equals(last_command)) {
+                requireSucess = false;
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(command));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_command + "->" + command);
             }
@@ -408,20 +409,21 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
         } else {
             HashMap map = new HashMap();
-            Instruction instruction = checkInst();
-            String next_device_code = instruction.getNext_device_code();
-            Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
             switch (command) {
                 case 0:
                     if (task == 0) {
                         applyTask();
                     }
+                    requireSucess = true;
                     break;
                 case 1:
                     message = "取货中";
                     break;
                 case 2:
                     message = "取货完成";
+                    Instruction instruction = checkInst();
+                    String next_device_code = instruction.getNext_device_code();
+                    Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
                     if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.conveyor.name())) {
                         map.put("to_z", nextDevice.getZ());
                         map.put("to_x", nextDevice.getX());
@@ -438,17 +440,21 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                         map.put("to_y", inst.getTo_y());
                     }
                     map.put("to_command", 2);
+                    requireSucess = true;
                     break;
                 case 3:
                     message = "放货中";
                     break;
                 case 4:
                     message = "请求卸货(申请卸货)";
-                    if (ObjectUtil.isNotNull(instruction)) {
+                    Instruction instruction1 = checkInst();
+                    String next_device_code1 = instruction1.getNext_device_code();
+                    Device nextDevice1 = deviceAppService.findDeviceByCode(next_device_code1);
+                    if (ObjectUtil.isNotNull(instruction1)) {
                         //指令为执行
                         SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
-                        if (nextDevice.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
-                            siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) nextDevice.getDeviceDriver();
+                        if (nextDevice1.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
+                            siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) nextDevice1.getDeviceDriver();
                             if (siemensConveyorDeviceDriver.getMode() != 2 || siemensConveyorDeviceDriver.getMove() == 1) {
                                 notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + siemensConveyorDeviceDriver.getDevice_code() +
                                         "有货或未联机,无法下发指令!指令号:" + inst.getInstruction_code();
@@ -457,30 +463,37 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                         }
                         map.put("to_command", 3);
                     }
+                    requireSucess = true;
                     break;
                 case 5:
                     message = "放货完成";
                     map.put("to_command", 5);
+                    Instruction inst = checkInst();
                     try {
                         finish_instruction(inst);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
+                    requireSucess = true;
                     break;
                 case 6:
                     message = "取货准备(会库位台)";
                     map.put("to_command", 6);
+                    requireSucess = true;
                     break;
                 case 7:
                     message = "召回";
                     map.put("to_command", 7);
+                    requireSucess = true;
                     break;
                 case 8:
                     message = "急停";
                     map.put("to_command", 8);
+                    requireSucess = true;
                     break;
                 default:
                     message = "不明";
+                    requireSucess = true;
                     break;
             }
             if (ObjectUtil.isNotNull(map)) {