diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index 3a9e1acf1..8fe15c654 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -148,7 +148,7 @@ public class CreateDDJInst { StandardStackerDeviceDriver standardStackerDeviceDriver; if (deviceByCode.getDeviceDriver() instanceof StandardStackerDeviceDriver) { standardStackerDeviceDriver = (StandardStackerDeviceDriver) deviceByCode.getDeviceDriver(); - if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getMove() == 1 || standardStackerDeviceDriver.getCommand() != 0) { + if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getForkCargo() == 1 || standardStackerDeviceDriver.getCommand() != 0) { log.error("堆垛机,{}未联机或者在执行中", deviceByCode.getDevice_code()); ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("堆垛机,{}未联机或者在执行中" + deviceByCode.getDevice_code()); return; @@ -295,7 +295,9 @@ public class CreateDDJInst { for (Instruction byDeviceCode : byDeviceCodes) { String nextDeviceCode = byDeviceCode.getNext_device_code(); Device nextdevice = appService.findDeviceByCode(nextDeviceCode); - if (startDevice.getDevice_type().equals(DeviceType.storage.name()) && + String startDeviceCode = byDeviceCode.getStart_device_code(); + Device startDevice1 = appService.findDeviceByCode(startDeviceCode); + if (startDevice1.getDevice_type().equals(DeviceType.storage.name()) && (nextdevice.getDevice_type().equals(DeviceType.conveyor.name()) || nextdevice.getDevice_type().equals(DeviceType.storage.name()))) { insts.add(byDeviceCode); }