From 0fc6d133c0e2e6e322821f47868b07758ae2cb5d Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 29 Apr 2025 19:41:57 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E5=8C=BA=E9=80=81=E7=A9=BA=E8=A1=8C=E6=9E=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../first_floor_area/auto/AutoSendVehicleToDjq.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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("补空(装箱区->管制区)"));