From 89dbc2218e74d2cdd85c982496b06842a98f24e1 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sun, 14 Jul 2024 09:03:01 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BstIvtPackageinfoivtServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 5dff638a1..d933c6d94 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 @@ -402,12 +402,12 @@ 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()); if (CollectionUtils.isNotEmpty(taskList3)) { 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() + "的任务未完成，请检查！"); + log.info("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！"); + throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！"); } else { if (!taskList3.get(0).getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) { - log.info("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，请等待桁架任务编号为:" + taskList3.get(0).getTask_code() + "的任务未完成，请检查！"); - throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，请等待桁架任务编号为:" + taskList3.get(0).getTask_code() + "的任务未完成，请检查！"); + log.info("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！"); + throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！"); } } } @@ -511,13 +511,13 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl待检区"))) { //过滤未二次分配的任务 if (StringUtils.isBlank(baseTask.getResponse_param())) { - throw new BadRequestException("该任务任务号为：" + baseTask.getTask_code() + ",起点未进行二次分配！"); + throw new BadRequestException("取货完成失败" + baseTask.getTask_code() + ",起点未进行二次分配！"); } List ivtList = packageinfoivtService.list(new LambdaQueryWrapper() .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")) .eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code1())); if (CollectionUtils.isEmpty(ivtList)) { - throw new BadRequestException("任务编号为：" + baseTask.getTask_code() + "agv取货完成的目标点位不存在！"); + throw new BadRequestException("取货完成失败" + baseTask.getTask_code() + "agv取货完成的目标点位不存在！"); } //只有子卷号相同才能清除库存 if (baseTask.getVehicle_code().equals(ivtList.get(0).getContainer_name())) { @@ -567,12 +567,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl updateWrapper1 = new UpdateWrapper<>(); updateWrapper1.eq("task_id", baseTask.getTask_id()); updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成")); taskService.update(updateWrapper1); - log.info("一楼装箱区二次分配取货完成" + baseTask.getTask_code() + ",取货完成执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code()); + log.info("一楼装箱区二次分配取货完成" + baseTask.getTask_code() + ",取货完成信号接收成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code()); } /**