feat: 分切上轴2提示修改

This commit is contained in:
2026-08-17 14:15:42 +08:00
parent 513a1c26f4
commit 22239d491d

View File

@@ -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<PdmBiSlittingproductionplan> 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<PdmBiSlittingproductionplan> pdmBiSlittingproductionplans = slittingproductionplanService.getByQzzNos(cachePointList.stream().map(Deliverycachepointivt::getQzzno).collect(Collectors.toList()));
tips.add("为设备[" + deviceCode + "]套好轴的位置在[" + cachePointList.stream().map(Deliverycachepointivt::getPoint_code).collect(Collectors.joining("','")) + "], " +