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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2024-05-16 10:15:53 +08:00
parent ae56989682 f22e96b99b
commit eafeca270c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java
View File

@ -226,11 +226,11 @@ public class BomNewEbomChildEntity implements Serializable {
private String materialOriginalUnit; private String materialOriginalUnit;
private String materialNoAndProjectType; // private String materialNoAndProjectType;
public String getMaterialNoAndProjectType() { // public String getMaterialNoAndProjectType() {
return StrUtil.join(materialNo,projectType); // return StrUtil.join(materialNo,projectType);
} // }
private static final long serialVersionUID = -14147430944632372L; private static final long serialVersionUID = -14147430944632372L;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
View File

@ -306,10 +306,10 @@ public abstract class BaseConvert {
if (oldChildList.size() != newChildList.size()) { if (oldChildList.size() != newChildList.size()) {
return false; return false;
} }
Map<String, BomNewEbomChildEntity> oldChildMap = oldChildList.stream().collect(Collectors.toMap(BomNewEbomChildEntity::getMaterialNoAndProjectType , Function.identity())); Map<String, List<BomNewEbomChildEntity> > oldChildMap = oldChildList.stream().collect(Collectors.groupingBy(u->StrUtil.join(u.getMaterialNo(),u.getProjectType()) ));
for (BomNewEbomChildEntity newChild : newChildList) { for (BomNewEbomChildEntity newChild : newChildList) {
String key=StrUtil.join(newChild.getMaterialNo(),newChild.getProjectType()); String key=StrUtil.join(newChild.getMaterialNo(),newChild.getProjectType());
if(!oldChildMap.containsKey(key) || Objects.equals(newChild.getNum(), oldChildMap.get(key).getNum()) ){ if(!oldChildMap.containsKey(key) || Objects.equals(newChild.getNum(), oldChildMap.get(key).get(0).getNum()) ){
return false; return false;
} }
} }