From d5956ada3ef72f480392e0a9b951a569ee1e9b98 Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 21 Jun 2024 09:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=99=E5=A4=A7=E6=8C=87=E4=BB=A4=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=96?= =?UTF-8?q?=E6=B6=88&=E7=BB=84=E7=9B=98=E6=89=BE=E4=B8=8D=E5=88=B0fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java | 2 +- .../nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java index 28cc182..83268c2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java @@ -75,7 +75,7 @@ public class QueryZDAgvTaskStatus { instructionService.update(inst); } } else if ("FINISHED".equals(status)) { - if (inst != null){ + if (inst != null&&!"3".equals(inst.getInstruction_status())){ String startPoint=inst.getStart_point_code(); Device start_device = deviceAppService.findDeviceByCode(startPoint); if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java index 18284c4..88eeb27 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java @@ -210,7 +210,10 @@ public class GHCMLTask extends AbstractTask { SchBasePoint startPointObj = pointService.getById(startPoint); SchBasePoint endPointObj = pointService.getById(endPoint); if (ObjectUtil.isNotEmpty(endPointObj)) { - SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id()); + SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo( + startPointObj.getVehicle_code(), + startPointObj.getVehicle_type(), + GroupBindMaterialStatusEnum.BOUND.getValue()); TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType); vehiclematerialgroup.setTask_code(taskObj.getTask_code()); // 设置链路id，使用任务编码