From 572f60077fe7525770db2426571cc7b68855a45c Mon Sep 17 00:00:00 2001 From: yanps Date: Mon, 6 May 2024 09:56:47 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=A0=86=E5=9E=9B=E6=9C=BA=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=8C=87=E4=BB=A4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/system/service/quartz/task/CreateDDJInst.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); }