From e26e5df2a20f5d49ddad2ff3b648b5a19ddc4ae2 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 6 Jun 2025 15:20:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E9=80=81=E7=A9=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E6=B4=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto/AutoSendVehicleToKzj.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 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 0bf2ccfaf..46eec179c 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 @@ -2,6 +2,7 @@ package org.nl.b_lms.sch.tasks.first_floor_area.auto; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -60,7 +61,6 @@ public class AutoSendVehicleToKzj extends Prun{ }catch (Exception ex){ log.error(ex.getMessage()); } - } @@ -83,12 +83,24 @@ public class AutoSendVehicleToKzj extends Prun{ List empPoints = this.packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空")); List vehiclePoints = this.packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具")); if (!CollectionUtils.isEmpty(empPoints) && !CollectionUtils.isEmpty(vehiclePoints) && existTask.size() < empPoints.size()) { + //增加空洞判断 + //车 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; + } 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(empPoints.get(0).getBlock(), empPoints.get(0).getWait_point_type())); - task.put("point_code3", empPoints.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); } }