From 49a39d5e1579c5e35580b5fdddd7571da70a1e26 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 30 Dec 2022 14:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=94=BE=E8=B4=A7?=
 =?UTF-8?q?=E5=89=8D=E5=86=8D=E5=BC=80=E9=97=A8=20=E7=94=B5=E6=B0=94?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OvenGantryManipulatorDeviceDriver.java           | 12 ++++++------
 .../SlitTwoManipulatorDeviceDriver.java              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index c23a2acf6..919fc8a5b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -232,7 +232,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
                 if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                     hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextDevice.getDeviceDriver();
-//                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
+                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
                     if (hongXiangConveyorDeviceDriver.getMode() == 1 && hongXiangConveyorDeviceDriver.getDoor() == 1 && hongXiangConveyorDeviceDriver.getAction() == 1 && hongXiangConveyorDeviceDriver.getError1() == 0) {
                         this.writing("to_command", "4");
                         this.setNow_steps_type(5);
@@ -499,11 +499,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 this.writing("to_target", next_addr);
                 this.writing("to_task", instdto.getInstruction_code());
                 this.writing("to_command", "1");
-                HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
-                if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver();
-                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
-                }
+//                HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
+//                if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
+//                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver();
+//                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
+//                }
                 this.setNow_steps_type(2);
                 this.setRequireSucess(true);
                 notCreateInstMessage = "";
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index 32524c0b2..da555b082 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -1218,7 +1218,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
         jo.put("isError", this.getIserror());
         jo.put("is_disable1", this.getIs_disable());
         jo.put("is_disable", is_disable);
-        jo.put("message", this.getMessage());
+        jo.put("message", "此时,type = 1时," + this.getNow_steps_type1() + ",type = 2时," + this.getNow_steps_type2() + ",type = 3时," + this.getNow_steps_type3());
         jo.put("is_click", true);
         jo.put("driver_type", "slit_two_manipulator");
         jo.put("notCreateTaskMessage", notCreateTaskMessage);