From 768fd2c2931c8781f7ecc2b81d66f1aec74b76b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 1 Aug 2024 19:15:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=ACPBOM=E4=BC=98=E5=8C=96-3(=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E8=BD=ACPBOM)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index e8577ff4..a2f8ead0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -974,7 +974,14 @@ public class BomNewEbomParentService extends ServiceImpl facCodes=new ArrayList<>(); + if(CollUtil.isEmpty(paramDto.getFacCodes()) && parent.getMaterialName().contains(EBomConstant.XIAN_TAO_FACTORY_Name_1020)){ + facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); + } + else { + facCodes=paramDto.getFacCodes(); + } + EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")? new EBomToPBomFor31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBom(parent, bomTree, facCodes, 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())); eBomToPBom.convert(); if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) { From ae38289524e696c03f525890714bb9a09425af68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 2 Aug 2024 08:17:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=ACPBOM=E4=BC=98=E5=8C=96-3(=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E8=BD=ACPBOM)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewEbomParentService.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index a2f8ead0..5254741b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -974,14 +974,8 @@ public class BomNewEbomParentService extends ServiceImpl facCodes=new ArrayList<>(); - if(CollUtil.isEmpty(paramDto.getFacCodes()) && parent.getMaterialName().contains(EBomConstant.XIAN_TAO_FACTORY_Name_1020)){ - facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); - } - else { - facCodes=paramDto.getFacCodes(); - } - EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")? new EBomToPBomFor31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBom(parent, bomTree, facCodes, 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())); + + EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")? new EBomToPBomFor31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBom(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())); eBomToPBom.convert(); if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {