From 45422b69397d7c1a53e9cb17d4c29e573910ad4d Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Mon, 19 Jan 2026 17:06:40 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=95=88=E7=8E=87=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=85=89=E7=94=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BoxPackageManipulatorDeviceDriver.java    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
index 1d4ef73f8..164b996e5 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
@@ -424,14 +424,16 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
-                        BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
-                        if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
-                            boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver();
-                            if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) {
-                                notCreateInstMessage = "universal_notCreateInstMessage2";
-                                return false;
-                            }
-                        }
+                        //效率提升屏蔽光电判断
+
+//                        BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
+//                        if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
+//                            boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver();
+//                            if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) {
+//                                notCreateInstMessage = "universal_notCreateInstMessage2";
+//                                return false;
+//                            }
+//                        }
 
                         ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver;
                         if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) {
@@ -553,11 +555,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 map12.put("value", interactionJsonDTO.getFrpModel());
                 list.add(map12);
             }
-            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
-                map13.put("code", "to_have_or_not");
-                map13.put("value", interactionJsonDTO.getIsHave());
-                list.add(map13);
-            }
+//            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
+//                map13.put("code", "to_have_or_not");
+//                map13.put("value", interactionJsonDTO.getIsHave());
+//                list.add(map13);
+//            }
         }
         this.writing(list);
         luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder()