diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java index 236093d07..80c383d43 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java @@ -69,11 +69,11 @@ public class AutoSendVehicleToDjq extends Prun{ try { if (tryLock) { if (isCalling.equals(IOSEnum.IS_NOTANDYES.code("否"))) { - //存在未完成的木箱出库任务 + //存在正在执行的行架任务 List taskList = taskService.list(new LambdaQueryWrapper() .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) - .eq(SchBaseTask::getTask_type, "010704")); + .eq(SchBaseTask::getTask_type, "010909")); if (ObjectUtils.isNotEmpty(taskList)) { return; } @@ -89,13 +89,6 @@ public class AutoSendVehicleToDjq extends Prun{ 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(); task.put("point_code1", zxqIvtList.get(0).getPoint_code()); getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));