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-17 14:20:16 +08:00
parent d01129f292 42761eee03
commit 694b2b918b
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,20 +210,6 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
}, syncOriginalBomToFormalPool);
}
//记录子级BOM版本行ID
List<BomNewOriginalChildEntity> originalChildEntities = new ArrayList<>();
bomAllChildList.forEach(k -> {
BomNewOriginalChildEntity entChild = new BomNewOriginalChildEntity();
entChild.setRowId(k.getRowId());
entChild.setBomVersionRowId(k.getBomRowId());
entChild.setNum(k.getNum());
entChild.setUnitWeight(k.getUnitWeight());
originalChildEntities.add(entChild);
});
if (CollUtil.isNotEmpty(originalChildEntities)) {
originalChildService.updateBatchById(originalChildEntities);
}
}
/**

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

@ -106,7 +106,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
List<BomOriginalListVO> result = new ArrayList();
//子级中，一般零部件
List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| u.getRegReplaceIs().equals(1))).collect(Collectors.toList());
List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| u.getRegReplaceIs().equals(1))).collect(Collectors.toList());
Map<String, List<BomOriginalListVO>> materialNoGroupMp =commonPartList.stream().collect(Collectors.groupingBy(BomOriginalListVO::getMaterialNo));
for (Map.Entry<String, List<BomOriginalListVO>> entry : materialNoGroupMp.entrySet()) {
@ -301,7 +301,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc());
parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
parentEntity.setMaterialUnit("KG");
parentEntity.setNum(parentEntity.getTotalWeight());
parentEntity.setProjectType("L");
parentEntity.setRegReplaceIs(1);
} else {