From fa976d8037a337a0cb516e3cfcc8d40c40338682 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 22 Sep 2025 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=B7=BB=E5=8A=A0=E7=83=98=E7=AE=B1?=
 =?UTF-8?q?=E6=A1=81=E6=9E=B6=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E3=80=81?=
 =?UTF-8?q?=E6=94=BE=E8=B4=A7=E5=AE=8C=E6=88=90=E5=88=A4=E6=96=AD=E7=83=98?=
 =?UTF-8?q?=E7=AE=B1=E5=88=97=E6=98=AF=E5=90=A6=E5=BC=80=E9=97=A8=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OvenGantryManipulatorDeviceDriver.java    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 0a44378bf..0da5c506f 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -542,7 +542,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 }
                 if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                     hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
-                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0) {
+                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0 ||  hongXiangConveyorDeviceDriver.getError() > 0) {
                         notCreateInstMessage = "就绪任务未创建指令原因->取货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电无货或者脱机,无法生成指令!";
                         return false;
                     }
@@ -550,7 +550,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
                 if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                     hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver();
-                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1) {
+                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1 || hongXiangConveyorDeviceDriver.getError() > 0) {
                         notCreateInstMessage = "就绪任务未创建指令原因->放货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电有货或者脱机,无法生成指令!";
                         return false;
                     }
@@ -947,6 +947,18 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 //                        EXECUTOR.execute(() -> {
                         toCloseDoor(device);
 //                        });
+                        //判断关联的同一列烘箱设备是否都关门 都关门返回false，有一个不关门就返回true
+                        boolean isCloseDoor = this.judgeCloseDoor(inst2.getStart_device_code(), inst2.getNext_device_code());
+                        //如果未关门结束
+                        if (isCloseDoor) {
+                            LuceneLogDto logDto = LuceneLogDto.builder()
+                                    .device_code(device_code)
+                                    .content("下发行架取货完成不满足条件：同一列烘箱有开门")
+                                    .build();
+                            logDto.setLog_level(4);
+                            luceneExecuteLogService.deviceExecuteLog(logDto);
+                            return;
+                        }
                         int mode = hongXiangConveyorDeviceDriver.getMode();
                         int door = hongXiangConveyorDeviceDriver.getDoor();
                         int action = hongXiangConveyorDeviceDriver.getAction();
@@ -1109,6 +1121,18 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 //                            EXECUTOR.execute(() -> {
                             toCloseDoor(nextDevice);
 //                            });
+                            //判断关联的同一列烘箱设备是否都关门 都关门返回false，有一个不关门就返回true
+                            boolean isCloseDoor = this.judgeCloseDoor(inst2.getStart_device_code(), inst2.getNext_device_code());
+                            //如果未关门结束
+                            if (isCloseDoor) {
+                                LuceneLogDto logDto = LuceneLogDto.builder()
+                                        .device_code(device_code)
+                                        .content("下发行架放货完成不满足条件：同一列烘箱有开门")
+                                        .build();
+                                logDto.setLog_level(4);
+                                luceneExecuteLogService.deviceExecuteLog(logDto);
+                                return;
+                            }
                             if (StrUtil.isNotEmpty(taskDto.getOven_time())) {
                                 //下发烘箱时间
                                 int time = Integer.parseInt(taskDto.getOven_time());