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;