From 827f985deb1ef1372d0f579494bc2cebe6a1c78e Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 20 Oct 2025 15:58:42 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=94=9F=E6=88=90=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=A0=A1=E9=AA=8C=E4=BA=8C=E6=AE=B5=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=8C=87=E4=BB=A4=E8=B5=B7=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConveyorWithScannerWeightDeviceDriver.java             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
index bbe2ed067..da0231ba5 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
@@ -1011,6 +1011,13 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 requireSucess = false;
                 return true;
             }
+            //判断有没有第二段出库输送指令，有的话则不生成入库指令
+            Instruction byStarCodeAndExcute = instructionService.findByStarCodeAndExcute(next_device_code);
+            if (ObjectUtil.isNotEmpty(byStarCodeAndExcute)) {
+                this.message = "有DDJ对接位出入库的指令";
+                requireSucess = false;
+                return true;
+            }
             //关联站点判断
             Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
             BeltConveyorDeviceDriver beltConveyorDeviceDriver;