转PBOM-油漆包问题(1010无需仙桃油漆包)
This commit is contained in:
parent
f9778ea8c1
commit
98a8405682
|
|
@ -68,9 +68,11 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
|
|||
data1010.add(parent);
|
||||
for (BomNewEbomParentVO data : deliveryPackage1010) {
|
||||
List<BomNewEbomParentVO> subVos = new ArrayList<>();
|
||||
if (data.getMaterialName().contains("仙桃") && !VirtualPackageTypeEnum.PAINT_PACKAGE.equalsValue(data.getVirtualPartType())) { //只获取下降虚拟包(排除仙桃油漆包)
|
||||
subVos.add(data);
|
||||
subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
|
||||
if (data.getMaterialName().contains("仙桃") ) { //只获取下降虚拟包(排除仙桃油漆包)
|
||||
if(!data.getMaterialName().contains(VirtualPackageTypeEnum.PAINT_PACKAGE.getDescription())) {
|
||||
subVos.add(data);
|
||||
subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
|
||||
}
|
||||
} else {
|
||||
// subVos = result.stream().filter(u -> u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(), BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList());
|
||||
subVos=getResultAllSubIncludeSelf(data);
|
||||
|
|
|
|||
Loading…
Reference in New Issue