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

bug-修复

This commit is contained in:
luoliming 2024-09-08 15:43:58 +08:00
parent 96f7923e26
commit fe657fc14f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,12 +40,12 @@ public class EBomToPBom extends EBomToPbomBase {
} }
private void splitData() { private void splitData() {
this.facCodes = new ArrayList<>(); // this.facCodes = new ArrayList<>();
//1020数据 //1020数据
List<BomNewEbomParentVO> data1020 = new ArrayList<>(); List<BomNewEbomParentVO> data1020 = new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList()); List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(deliveryPackage1020)) { if (CollUtil.isNotEmpty(deliveryPackage1020)) {
facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); // facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
data1020.add(parent); data1020.add(parent);
for (BomNewEbomParentVO data : deliveryPackage1020) { for (BomNewEbomParentVO data : deliveryPackage1020) {
List<BomNewEbomParentVO> subVos = getResultAllSubIncludeSelf(data); List<BomNewEbomParentVO> subVos = getResultAllSubIncludeSelf(data);
@ -58,7 +58,7 @@ public class EBomToPBom extends EBomToPbomBase {
List<BomNewEbomParentVO> data1010 = new ArrayList<>(); List<BomNewEbomParentVO> data1010 = new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃") List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃")
if (CollUtil.isNotEmpty(deliveryPackage1010)) { if (CollUtil.isNotEmpty(deliveryPackage1010)) {
facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); // facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010);
data1010.add(parent); data1010.add(parent);
for (BomNewEbomParentVO data : deliveryPackage1010) { for (BomNewEbomParentVO data : deliveryPackage1010) {
List<BomNewEbomParentVO> subVos = new ArrayList<>(); List<BomNewEbomParentVO> subVos = new ArrayList<>();

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java
View File

@ -43,12 +43,12 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
} }
private void splitData() { private void splitData() {
this.facCodes = new ArrayList<>();
//1020数据 //1020数据
List<BomNewEbomParentVO> data1020 = new ArrayList<>(); List<BomNewEbomParentVO> data1020 = new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList()); List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(deliveryPackage1020)) { if (CollUtil.isNotEmpty(deliveryPackage1020)) {
facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
data1020.add(parent); data1020.add(parent);
for (BomNewEbomParentVO data : deliveryPackage1020) { for (BomNewEbomParentVO data : deliveryPackage1020) {
List<BomNewEbomParentVO> subVos = getResultAllSubIncludeSelf(data); List<BomNewEbomParentVO> subVos = getResultAllSubIncludeSelf(data);
@ -61,7 +61,7 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
List<BomNewEbomParentVO> data1010 = new ArrayList<>(); List<BomNewEbomParentVO> data1010 = new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃") List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃")
if (CollUtil.isNotEmpty(deliveryPackage1010)) { if (CollUtil.isNotEmpty(deliveryPackage1010)) {
facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010);
data1010.add(parent); data1010.add(parent);
for (BomNewEbomParentVO data : deliveryPackage1010) { for (BomNewEbomParentVO data : deliveryPackage1010) {
List<BomNewEbomParentVO> subVos = new ArrayList<>(); List<BomNewEbomParentVO> subVos = new ArrayList<>();