From c87492af5492e19e24471a9e70cd8e216884b722 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 18 Jul 2024 23:41:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A5=E7=A9=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=97=B6=E9=97=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 72cf015c1..a98026ae7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -406,8 +406,14 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl taskList3 = taskList.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) || r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))).collect(Collectors.toList()); + List taskList3 = taskList.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) + || r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(taskList3)) { + if (taskList3.stream().allMatch(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")))) { + if (taskList3.get(0).getTask_status().equals(TaskStatusEnum.SURE_END.getCode())) { + return; + } + } if (StringUtils.isBlank(taskList3.get(0).getRequest_param())) { log.info("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！"); throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！");