diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 40c05abf..b8992ae8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -2788,14 +2788,23 @@ public class BomNewEbomParentService extends ServiceImpl> gc = children.stream().collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName)); + Map> gc = children.stream().filter(g -> !g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName)); + Map> gc21 = children.stream().filter(g -> g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialDesc)); gc.forEach((k, v) -> { if (v.size() > 1) { sb.append(StrUtil.format("{}的物料名称相同。", StrUtil.join(",", v.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toList())))); } }); + gc21.forEach((k, v) -> { + if (v.size() > 1) { + sb.append(StrUtil.format("{}的物料描述相同。", + StrUtil.join(",", v.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toList())))); + } + }); + String err = sb.toString(); VUtils.isTure(StrUtil.isNotBlank(err)).throwMessage("请先处理下面的错误:" + err);