From 1abe523c2395e2cbc8c73401fd31cbbafff2fcad Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 23 Dec 2025 20:27:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/auto/AutoCallAirShaftTask.java | 8 ++++++++ .../slitter/service/impl/SlitterServiceImpl.java | 13 +++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index cb4c3c5ec..0d73c702e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -223,6 +223,14 @@ public class AutoCallAirShaftTask extends Prun { } } } + try { + plans.sort(Comparator + .comparing(SlitterPlanDistinctDto::getManufacture_sort).reversed() + .thenComparing(SlitterPlanDistinctDto::getStart_time) + .thenComparing(SlitterPlanDistinctDto::getSplit_group)); + } catch (Exception e) { + stepErrorInfo.add("排序失败，没有进行排序！"); + } log.info("获取过滤后的分切计划数据：{}", JSON.toJSONString(plans)); // 查看套轴对接位是否满了 List emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1", diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 39aef0172..76c12bd84 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -647,11 +647,13 @@ public class SlitterServiceImpl implements SlitterService { } BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false); // 获取气涨轴缓存没有任务的点位 -// List shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize, -// startPoint.getQzz_generation(), startPoint.getPoint_location()); -// if (shafttubeivts.size() == 0) { -// throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位"); -// } + List shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize, + startPoint.getQzz_generation(), startPoint.getPoint_location()); + if (shafttubeivts.size() == 0) { + stepTipLogs.add(">>>未找到气涨轴规格「" + qzzSize + "」的暂存位"); + redisUtils.set("ERROR" + deviceCode, stepTipLogs); + throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位"); + } BstIvtShafttubeivt pickWaitPoint = shafttubeivtService.getOne(new LambdaQueryWrapper() .eq(BstIvtShafttubeivt::getPoint_location, startPoint.getPoint_location()) .eq(BstIvtShafttubeivt::getPoint_type, "7")); @@ -660,7 +662,6 @@ public class SlitterServiceImpl implements SlitterService { redisUtils.set("ERROR" + deviceCode, stepTipLogs); throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的等待点位"); } -// BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0); JSONObject taskParam = new JSONObject(); taskParam.put("point_code1", pickWaitPoint.getPoint_code()); taskParam.put("point_code2", startPoint.getPoint_code());