From beb2b49d50ae833f69dd8960bb4b3c8ab3a10b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Mon, 3 Apr 2023 23:00:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20RGV=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java    | 22 +++++--------------
 .../auto/run/NDCSocketConnectionAutoRun.java  |  2 +-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
index 24dadb8..2669f81 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
@@ -260,15 +260,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                         instructionService.update(inst1);
                     }
                 }
-                if (action_1 == 0) {
-                    if (task2 > 0) {
-                        if (action_2 == 2) {
-                            writing("to_command1", "1");
-                        }
-                    } else {
-                        writing("to_command1", "1");
-                    }
-                }
             }
             if (action_1 == 4 && move_1 == 0 && task1 > 0) {
                 //inst_message
@@ -277,7 +268,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                     try {
                         finish_instruction(inst1);
                     } catch (Exception e) {
-                        logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成失败，请手动完成。");
+                        log.error("RGV 前工位完成指令异常", e);
+                        logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成异常，异常原因：" + e.getMessage());
                     }
                     writing("to_command1", "0");
                     writing("to_onset1", "0");
@@ -298,9 +290,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                         instructionService.update(inst2);
                     }
                 }
-                if (action_2 == 0) {
-                    writing("to_command2", "1");
-                }
             }
             if (action_2 == 4 && move_2 == 0 && task2 > 0) {
                 //inst_message
@@ -309,7 +298,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                     try {
                         finish_instruction(inst2);
                     } catch (Exception e) {
-                        logServer.deviceExecuteLog(this.device_code, "", "", "后工位指令" + task2 + "完成失败，请手动完成。");
+                        log.error("RGV 前工位完成指令异常", e);
+                        logServer.deviceExecuteLog(this.device_code, "", "", "后工位指令" + task1 + "完成异常，异常原因：" + e.getMessage());
                     }
                     writing("to_command2", "0");
                     writing("to_onset2", "0");
@@ -499,7 +489,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                 String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
                 String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
 
-//                writing("to_command1", "1");
+                writing("to_command1", "1");
                 writing("to_onset1", start_addr);
                 writing("to_target1", next_addr);
                 writing("to_task1", instdto.getInstruction_code());
@@ -579,7 +569,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                 String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
                 String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
 
-//                writing("to_command2", "1");
+                writing("to_command2", "1");
                 writing("to_onset2", start_addr);
                 writing("to_target2", next_addr);
                 writing("to_task2", instdto.getInstruction_code());
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
index d6db5f1..08b2583 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
@@ -396,7 +396,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                     }
                                     logServer.deviceExecuteLog("ndc","","","phase==0x06," + "指令号：" + ikey + ",address：RYSMW01");
                                     //检测站点
-                                    if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
+                                    if (ObjectUtil.isNotEmpty(device) && device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
                                         lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
                                         if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMode() != 6) {
                                             inst.setExecute_status("9");