From 31e954e6c2de85cc857cfc6a2f378de2dcaa4655 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 30 Dec 2022 21:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OvenGantryManipulatorDeviceDriver.java             | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 330ef00dc..9bff92190 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);
@@ -501,7 +501,13 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 this.writing("to_command", "1");
                 HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
                 if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver();
+                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextDevice.getDeviceDriver();
+                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
+                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
+                }
+                if (startDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver){
+                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startDevice.getDeviceDriver();
+                    hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
                     hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
                 }
                 this.setNow_steps_type(2);