From a593e5e044a3b7dc1b50032cca3cd7027de0abf7 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Sun, 9 Mar 2025 16:06:24 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=8B=94=E5=89=8D=E8=A1=8C?= =?UTF-8?q?=E6=9E=B6=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88=E7=BA=A7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PullHeadManipulatorDeviceDriver.java | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 4cd7df7bc..2774a92fa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -435,9 +435,9 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } } } + taskDtosReady = this.sortTask(taskDtosReady); for (int j = 0; j < taskDtosReady.size(); j++) { //按照优先级排序 优先级相等按照创建时间排序 - taskDtosReady = this.sortTask(taskDtosReady); task = taskDtosReady.get(j); // 6 行架任务 8烘箱任务 if (!StrUtil.equals(task.getTask_type(), "6")) { @@ -445,6 +445,23 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp continue; } if (ObjectUtil.isNotEmpty(task)) { + Device nextdevice = deviceAppService.findDeviceByCode(task.getNext_device_code()); + Device startdevice = deviceAppService.findDeviceByCode(task.getStart_device_code()); + if (startdevice.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) { + plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) startdevice.getDeviceDriver(); + if (plugPullDeviceSiteDeviceDriver.getAction() != 1) { + notCreateInstMessage = "就绪任务未创建指令原因->" + task.getStart_device_code() + "工位状态为不允许取，无法生成指令"; + continue; + } + } + + if (nextdevice.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) { + plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) nextdevice.getDeviceDriver(); + if (plugPullDeviceSiteDeviceDriver.getAction() != 2) { + notCreateInstMessage = "就绪任务未创建指令原因->" + task.getNext_device_code() + "工位状态为不允许放，无法生成指令"; + continue; + } + } break start; } } @@ -452,24 +469,6 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } } if (!ObjectUtil.isEmpty(task)) { - Device nextdevice = deviceAppService.findDeviceByCode(task.getNext_device_code()); - Device startdevice = deviceAppService.findDeviceByCode(task.getStart_device_code()); - if (startdevice.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) { - plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) startdevice.getDeviceDriver(); - if (plugPullDeviceSiteDeviceDriver.getAction() != 1) { - notCreateInstMessage = "就绪任务未创建指令原因->" + task.getStart_device_code() + "工位状态为不允许取，无法生成指令"; - return false; - } - } - - if (nextdevice.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) { - plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (plugPullDeviceSiteDeviceDriver.getAction() != 2) { - notCreateInstMessage = "就绪任务未创建指令原因->" + task.getNext_device_code() + "工位状态为不允许放，无法生成指令"; - return false; - } - } - String taskId = task.getTask_id(); String taskCode = task.getTask_code(); String vehicleCode = task.getVehicle_code();