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-08 16:06:25 +08:00
parent 83cc93e573
commit 79bd061eac
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,8 +299,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
.eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)") .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")
))); )));
if (CollectionUtils.isNotEmpty(taskList)) { if (CollectionUtils.isNotEmpty(taskList)) {
if (!taskList.get(0).getRequest_param().equals(IOSEnum.IS_SEND.code("是"))) { if (StringUtils.isBlank(taskList.get(0).getRequest_param())) {
throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位"); throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位");
} else {
if (!taskList.get(0).getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位");
}
} }
} }
newPoint = checkIvtSBlock(); newPoint = checkIvtSBlock();
@@ -371,8 +375,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
//清空起点库存状态 //清空起点库存状态
bstIvtPackageinfoivtMapper.update(null, updateWrapper); bstIvtPackageinfoivtMapper.update(null, updateWrapper);
//标记桁架任务取空载具完成 //标记桁架任务取空载具完成
baseTask.setRequest_param(IOSEnum.IS_SEND.code("是")); UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
taskService.update(); updateWrapper1.eq("task_id", baseTask.getTask_id());
updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"));
taskService.update(updateWrapper1);
} }
} else { } else {
//放货任务 //放货任务

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
View File

@@ -121,8 +121,6 @@ public class AutoSendVehicleToKzj {
} else { } else {
pointCode2 = kzjIvtList.get(0).getPoint_code(); pointCode2 = kzjIvtList.get(0).getPoint_code();
} }
//待检区有空载具且过滤未完成任务 //待检区有空载具且过滤未完成任务
List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), ""); List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {