From 285605b151c2ee1a79225faa2bfc752fc667d399 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 12 Jun 2025 15:04:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=86=99=E6=AD=BB=E7=9A=84=E7=AE=A1=E5=88=B6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java | 2 +- .../sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java | 2 +- .../sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java index 13b82b838..3d1084c41 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java @@ -84,7 +84,7 @@ public class AutoSendDjqToGzq extends Prun{ //todo 新增NG卷放置临时管制区135136，只取空不补空 List ivtLists = gzqPackageinfoivtList.stream() - .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136")) + .filter(r -> r.getPoint_status().equals(4)) .collect(Collectors.toList()); if (ObjectUtils.isEmpty(ivtLists)) { log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java index 93204dd36..7718b73ec 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java @@ -68,7 +68,7 @@ public class AutoSendGzqToDjq extends Prun{ //todo 新增NG卷放置临时管制区135136，只取空不补空 List ivtLists = gzqIvtList.stream() - .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136")) + .filter(r -> r.getPoint_status().equals("4")) .collect(Collectors.toList()); if (ObjectUtils.isNotEmpty(ivtLists)) { pointCode3 = ivtLists.get(0).getPoint_code(); 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 80c383d43..496874659 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 @@ -111,7 +111,7 @@ public class AutoSendVehicleToDjq extends Prun{ //todo 新增NG卷放置临时管制区135136，只取空不补空 packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); packageList = packageList.stream() - .filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136")) + .filter(r -> !r.getPoint_status().equals("4")) .collect(Collectors.toList()); task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); } else { @@ -120,7 +120,7 @@ public class AutoSendVehicleToDjq extends Prun{ } else { packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); packageList = packageList.stream() - .filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136")) + .filter(r -> r.getPoint_status().equals("4")) .collect(Collectors.toList()); if (ObjectUtils.isEmpty(packageList)) { packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));