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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-06-06 09:46:35 +08:00
parent aea94aa852 3b68e7c76f
commit 111456e587
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -942,7 +942,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
ebomChildService.updateBatchById(bomChildren); ebomChildService.updateBatchById(bomChildren);
} }
SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId); // SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
} }
} }

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

@ -107,7 +107,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
List<BomOriginalListVO> result = new ArrayList(); List<BomOriginalListVO> result = new ArrayList();
//子级中，一般零部件 //子级中，一般零部件
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()); List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) && u.getRegReplaceIs().equals(1)).collect(Collectors.toList());
Map<String, List<BomOriginalListVO>> materialNoGroupMp =commonPartList.stream().collect(Collectors.groupingBy(BomOriginalListVO::getMaterialNo)); Map<String, List<BomOriginalListVO>> materialNoGroupMp =commonPartList.stream().collect(Collectors.groupingBy(BomOriginalListVO::getMaterialNo));
for (Map.Entry<String, List<BomOriginalListVO>> entry : materialNoGroupMp.entrySet()) { for (Map.Entry<String, List<BomOriginalListVO>> entry : materialNoGroupMp.entrySet()) {
@ -119,9 +119,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
for (BomOriginalListVO item : list1) { for (BomOriginalListVO item : list1) {
BigDecimal numNew=BigDecimal.ZERO; BigDecimal numNew=BigDecimal.ZERO;
if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){ if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
numNew= item.getTotalWeight();
}else {
numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum()); numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
}else {
numNew= item.getNum();
} }
// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO); // numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
numResult = NumberUtil.add(numResult, numNew); numResult = NumberUtil.add(numResult, numNew);