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

opt:优化装箱区送空行架任务校验

Browse Source
This commit is contained in:
zhangzq
2025-04-29 19:41:57 +08:00
parent 98f26916cc
commit 0fc6d133c0
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,11 +69,11 @@ public class AutoSendVehicleToDjq extends Prun{
try { try {
if (tryLock) { if (tryLock) {
if (isCalling.equals(IOSEnum.IS_NOTANDYES.code("否"))) { if (isCalling.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
//存在未完成的木箱出库任务 //存在正在执行的行架任务
List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>() List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
.eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
.eq(SchBaseTask::getTask_type, "010704")); .eq(SchBaseTask::getTask_type, "010909"));
if (ObjectUtils.isNotEmpty(taskList)) { if (ObjectUtils.isNotEmpty(taskList)) {
return; return;
} }
@@ -89,13 +89,6 @@ public class AutoSendVehicleToDjq extends Prun{
zxqIvtList = zxqIvtList.stream().filter(r -> r.getBlock().equals(block)).collect(Collectors.toList()); zxqIvtList = zxqIvtList.stream().filter(r -> r.getBlock().equals(block)).collect(Collectors.toList());
} }
} }
// if ( Integer.parseInt(zxqIvtList.get(0).getSort_seq().toString()) % 2 != 0) {
// //优先去管制区
// pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
// } else {
// pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
// }
//todo 新增NG卷放置临时管制区135136，优先去补管制区
JSONObject task = new JSONObject(); JSONObject task = new JSONObject();
task.put("point_code1", zxqIvtList.get(0).getPoint_code()); task.put("point_code1", zxqIvtList.get(0).getPoint_code());
getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));