Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
This commit is contained in:
commit
b1c73c19e1
|
|
@ -2788,14 +2788,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
|||
.list();
|
||||
if (CollUtil.isNotEmpty(children)) {
|
||||
//是否有物料名称相同的物料
|
||||
//21编码校验物料描述就好,不用去校验名称 by 10002327 0920
|
||||
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) -> {
|
||||
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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue