From 513a1c26f4c5d0b9eea3ed933630e504452860ca Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 16 Aug 2026 15:00:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E7=A4=BA=E3=80=81=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PdmBiSlittingproductionplanServiceImpl.java | 2 +- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index cd8bd9f33..165f87415 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -260,7 +260,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); lam.eq(PdmBiSlittingproductionplan::getResource_name, deviceCode) .eq(PdmBiSlittingproductionplan::getIs_delete, "0") - .apply("DATE(call_time) >= DATE_SUB(CURDATE(), INTERVAL 1 DAY)") + .apply("DATE(start_time) >= DATE_SUB(CURDATE(), INTERVAL 1 DAY)") .orderByAsc(PdmBiSlittingproductionplan::getStatus, PdmBiSlittingproductionplan::getWorkorder_id); return list(lam); } 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 9ac61c2fb..df2ead6b0 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 @@ -745,6 +745,9 @@ public class SlitterServiceImpl implements SlitterService { log.info("获取下一趟分切计划数据：{}", filterNextPlans); // 查找分切对接位空位（根据原理分切机先放，优先放）（区域、location、plan进行过滤） List slitterDownNewDtoList = slitterMapper.getCanDownPoints(actualDevice); + if (slitterDownNewDtoList.isEmpty()) { + throw new BadRequestException("找不到分切对接位空位"); + } String groupId = IdUtil.getStringId(); // 筛选上下轴各一条 PdmBiSlittingproductionplan nextUpPlan = filterNextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null);