From 257f8cbeced1240641152e6d51e0573bcd49707e Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 17 Apr 2024 10:39:01 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReturnGoodManipulatorDeviceDriver.java       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
index 5c413a60e..d55481512 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
@@ -374,15 +374,15 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
-                        //存在托盘才可以申请任务
+                        //存在托盘才可以申请任务  不需要这个逻辑，先下发行架任务后送空盘
                         BeltConveyorDeviceDriver beltConveyorDeviceDriver;
-                        if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
-                            beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver();
-                            if (beltConveyorDeviceDriver.getMove() != 1) {
-                                notCreateInstMessage = "universal_notCreateInstMessage2";
-                                return false;
-                            }
-                        }
+//                        if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
+//                            beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver();
+//                            if (beltConveyorDeviceDriver.getMove() != 1) {
+//                                notCreateInstMessage = "universal_notCreateInstMessage2";
+//                                return false;
+//                            }
+//                        }
                         String taskid = taskDto.getTask_id();
                         String taskcode = taskDto.getTask_code();
                         String start_point_code = taskDto.getStart_point_code();