From 07550c7edd46aae8f525834b123e12b8d4f86090 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 24 Sep 2025 20:20:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=80=E6=AC=A1=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=A9=BA=E8=BD=BD=E5=85=B7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=B0=E5=AD=90=E5=8D=B7=E4=B8=8B=E7=BA=BF=E6=A1=81=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto/AutoSendVehicleToKzj.java | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 406344abe..ba3d7b381 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -101,22 +101,43 @@ public class AutoSendVehicleToKzj extends Prun{ //增加空洞判断 //车 04 05 06 //☒☒口 ☒口☒ ☒口口: - BstIvtPackageinfoivt disPoint = empPoints.get(0); - int count = packageinfoivtService.count(new QueryWrapper() - .lt("sort_seq", disPoint.getSort_seq()) - .eq("point_status", PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位")) - .eq("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具"))); - if (count>0){ - log.warn("当前点位存在空洞的情况"+disPoint.getPoint_code()); - return; + if (existTask.size()==0 && empPoints.size() > 1 && vehiclePoints.size() > 1) { + for (int i = 0; i < 2; i++) { + BstIvtPackageinfoivt disPoint = empPoints.get(i); + int count = packageinfoivtService.count(new QueryWrapper() + .lt("sort_seq", disPoint.getSort_seq()) + .eq("point_status", PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位")) + .eq("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具"))); + if (count>0){ + log.warn("当前点位存在空洞的情况"+disPoint.getPoint_code()); + return; + } + JSONObject task = new JSONObject(); + task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); + task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); + task.put("point_code1", vehiclePoints.get(i).getPoint_code()); + task.put("point_code2", this.packageinfoivtService.getWaitPoint(disPoint.getBlock(), disPoint.getWait_point_type())); + task.put("point_code3", disPoint.getPoint_code()); + this.djqToKzjhcwTask.createTask(task); + } + }else { + BstIvtPackageinfoivt disPoint = empPoints.get(0); + int count = packageinfoivtService.count(new QueryWrapper() + .lt("sort_seq", disPoint.getSort_seq()) + .eq("point_status", PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位")) + .eq("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具"))); + if (count>0){ + log.warn("当前点位存在空洞的情况"+disPoint.getPoint_code()); + return; + } + JSONObject task = new JSONObject(); + task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); + task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); + task.put("point_code1", vehiclePoints.get(0).getPoint_code()); + task.put("point_code2", this.packageinfoivtService.getWaitPoint(disPoint.getBlock(), disPoint.getWait_point_type())); + task.put("point_code3", disPoint.getPoint_code()); + this.djqToKzjhcwTask.createTask(task); } - JSONObject task = new JSONObject(); - task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); - task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); - task.put("point_code1", vehiclePoints.get(0).getPoint_code()); - task.put("point_code2", this.packageinfoivtService.getWaitPoint(disPoint.getBlock(), disPoint.getWait_point_type())); - task.put("point_code3", disPoint.getPoint_code()); - this.djqToKzjhcwTask.createTask(task); } } } finally {