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 a546a682a..2d4969d73 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
@@ -16,6 +16,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
@@ -787,6 +788,13 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             //判断有无出入库任务是相同路线
             //判断有没有DDJ对接位出入库的指令
             List<Instruction> byCodeAndExcute = instructionService.findByCodeAndExcute(next_device_code);
+            if (CollUtil.isNotEmpty(byCodeAndExcute)){
+                for (Instruction instruction : byCodeAndExcute) {
+                    Device nextDevice = deviceAppService.findDeviceByCode(instruction.getNext_device_code());
+                    byCodeAndExcute.removeIf(item ->StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name()));
+                }
+
+            }
             if (CollUtil.isNotEmpty(byCodeAndExcute)){
                 this.message="有DDJ对接位出入库的指令";
                 requireSucess = false;
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
index 866f2ec9a..15c67264a 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
@@ -247,7 +247,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 }
 
                 //任务完成
-                if (action == 4 && move == 0) {
+                if (action == 5 && move == 0) {
                     if (inst != null) {
                         try {
                             logServer.deviceExecuteLog(this.device_code, "", "", "放货完成");