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);