1、合并数量问题
This commit is contained in:
parent
839a2bd0d4
commit
3b68e7c76f
|
|
@ -107,7 +107,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
|
|||
|
||||
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));
|
||||
for (Map.Entry<String, List<BomOriginalListVO>> entry : materialNoGroupMp.entrySet()) {
|
||||
|
|
@ -121,7 +121,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
|
|||
if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
|
||||
numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
|
||||
}else {
|
||||
numNew= item.getTotalWeight();
|
||||
numNew= item.getNum();
|
||||
}
|
||||
// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
|
||||
numResult = NumberUtil.add(numResult, numNew);
|
||||
|
|
|
|||
Loading…
Reference in New Issue