root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:优化日志记录

Browse Source
This commit is contained in:
gongbaoxiong
2024-07-14 09:03:01 +08:00
parent de653e68a4
commit 89dbc2218e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -402,12 +402,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
List<SchBaseTask> 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<SchBaseTask> 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 (CollectionUtils.isNotEmpty(taskList3)) {
if (StringUtils.isBlank(taskList3.get(0).getRequest_param())) { if (StringUtils.isBlank(taskList3.get(0).getRequest_param())) {
log.info("一楼装箱区放货分配" + 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() + "的任务未完成，请检查！"); throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！");
} else { } else {
if (!taskList3.get(0).getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) { if (!taskList3.get(0).getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
log.info("一楼装箱区放货分配" + 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() + "的任务未完成，请检查！"); throw new BadRequestException("一楼装箱区放货分配" + baseTask.getTask_code() + ",分配失败，桁架任务编号为:" + taskList3.get(0).getTask_code() + "的取载具动作未完成，请检查！");
} }
} }
} }
@@ -511,13 +511,13 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"))) { if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"))) {
//过滤未二次分配的任务 //过滤未二次分配的任务
if (StringUtils.isBlank(baseTask.getResponse_param())) { if (StringUtils.isBlank(baseTask.getResponse_param())) {
throw new BadRequestException("该任务任务号为：" + baseTask.getTask_code() + ",起点未进行二次分配！"); throw new BadRequestException("取货完成失败" + baseTask.getTask_code() + ",起点未进行二次分配！");
} }
List<BstIvtPackageinfoivt> ivtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>() List<BstIvtPackageinfoivt> ivtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
.eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")) .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
.eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code1())); .eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code1()));
if (CollectionUtils.isEmpty(ivtList)) { 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())) { if (baseTask.getVehicle_code().equals(ivtList.get(0).getContainer_name())) {
@@ -567,12 +567,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
//清空起点库存状态 //清空起点库存状态
bstIvtPackageinfoivtMapper.update(null, updateWrapper); bstIvtPackageinfoivtMapper.update(null, updateWrapper);
log.info("一楼装箱区二次分配清空起点库存" + baseTask.getTask_code() + ",执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code()); log.info("一楼装箱区二次分配清空起点库存" + baseTask.getTask_code() + ",执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code());
//标记取满轴或取空载具完成 //标记agv取满轴或四个点或两个点任务取空载具完成
UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>(); UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
updateWrapper1.eq("task_id", baseTask.getTask_id()); updateWrapper1.eq("task_id", baseTask.getTask_id());
updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成")); updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"));
taskService.update(updateWrapper1); taskService.update(updateWrapper1);
log.info("一楼装箱区二次分配取货完成" + baseTask.getTask_code() + ",取货完成执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code()); log.info("一楼装箱区二次分配取货完成" + baseTask.getTask_code() + ",取货完成信号接收成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code());
} }
/** /**