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 df2ead6b0..a6b31c2f4 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 @@ -2743,10 +2743,12 @@ public class SlitterServiceImpl implements SlitterService { tips.add("没有为设备[" + deviceCode + "]套好轴的位置!或者已经创建任务!"); } else { if (cutPointList.size() > 0) { - String collect = timePlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.joining("','")); - // 找到该分切计划的点位 + List pdmBiSlittingproductionplans = slittingproductionplanService.getByQzzNos(cutPointList.stream() + .flatMap(point -> Stream.of(point.getQzz_no1(), point.getQzz_no2())) + .filter(Objects::nonNull) + .collect(Collectors.toList())); tips.add("为设备[" + deviceCode + "]套好轴的位置在[" + cutPointList.stream().map(BstIvtCutpointivt::getPoint_code).collect(Collectors.joining("','")) + "], " + - "对应的计划: " + collect); + "对应的计划: " + pdmBiSlittingproductionplans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); } else { List pdmBiSlittingproductionplans = slittingproductionplanService.getByQzzNos(cachePointList.stream().map(Deliverycachepointivt::getQzzno).collect(Collectors.toList())); tips.add("为设备[" + deviceCode + "]套好轴的位置在[" + cachePointList.stream().map(Deliverycachepointivt::getPoint_code).collect(Collectors.joining("','")) + "], " +