root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 提示、计划时间校验

Browse Source
This commit is contained in:
liyongde
2026-08-16 15:00:04 +08:00
parent adc13f989d
commit 513a1c26f4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
View File

@@ -260,7 +260,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new LambdaQueryWrapper<>();
lam.eq(PdmBiSlittingproductionplan::getResource_name, deviceCode) lam.eq(PdmBiSlittingproductionplan::getResource_name, deviceCode)
.eq(PdmBiSlittingproductionplan::getIs_delete, "0") .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); .orderByAsc(PdmBiSlittingproductionplan::getStatus, PdmBiSlittingproductionplan::getWorkorder_id);
return list(lam); return list(lam);
} }

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -745,6 +745,9 @@ public class SlitterServiceImpl implements SlitterService {
log.info("获取下一趟分切计划数据：{}", filterNextPlans); log.info("获取下一趟分切计划数据：{}", filterNextPlans);
// 查找分切对接位空位（根据原理分切机先放，优先放）（区域、location、plan进行过滤） // 查找分切对接位空位（根据原理分切机先放，优先放）（区域、location、plan进行过滤）
List<SlitterDownNewDto> slitterDownNewDtoList = slitterMapper.getCanDownPoints(actualDevice); List<SlitterDownNewDto> slitterDownNewDtoList = slitterMapper.getCanDownPoints(actualDevice);
if (slitterDownNewDtoList.isEmpty()) {
throw new BadRequestException("找不到分切对接位空位");
}
String groupId = IdUtil.getStringId(); String groupId = IdUtil.getStringId();
// 筛选上下轴各一条 // 筛选上下轴各一条
PdmBiSlittingproductionplan nextUpPlan = filterNextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null); PdmBiSlittingproductionplan nextUpPlan = filterNextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null);