rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test

This commit is contained in:
10001392 2024-09-24 19:37:47 +08:00
parent 5e589ec30d 0e1fd46fd7
commit b1c73c19e1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -2788,14 +2788,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
.list(); .list();
if (CollUtil.isNotEmpty(children)) { if (CollUtil.isNotEmpty(children)) {
//是否有物料名称相同的物料 //是否有物料名称相同的物料
//21编码校验物料描述就好，不用去校验名称 by 10002327 0920
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Map<String, List<BomNewEbomChildEntity>> gc = children.stream().collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName)); Map<String, List<BomNewEbomChildEntity>> gc = children.stream().filter(g -> !g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName));
Map<String, List<BomNewEbomChildEntity>> gc21 = children.stream().filter(g -> g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialDesc));
gc.forEach((k, v) -> { gc.forEach((k, v) -> {
if (v.size() > 1) { if (v.size() > 1) {
sb.append(StrUtil.format("{}的物料名称相同。", sb.append(StrUtil.format("{}的物料名称相同。",
StrUtil.join(",", v.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toList())))); 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(); String err = sb.toString();
VUtils.isTure(StrUtil.isNotBlank(err)).throwMessage("请先处理下面的错误：" + err); VUtils.isTure(StrUtil.isNotBlank(err)).throwMessage("请先处理下面的错误：" + err);