From 910f7d637abc14770ee55ab7925b7b2caea8b145 Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 27 Jun 2024 16:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=8A=9B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/BaseForwardReport.java | 4 +- .../domain/EBom/EBomForwardReport.java | 35 ++++++++++------- .../domain/PBom/PBomForwardReport.java | 38 ++++++++++++------- 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java index 6010b21d..ce7d8653 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java @@ -161,7 +161,9 @@ public abstract class BaseForwardReport { reportBomVO.setBomType(query.getBomType()); reportBomVO.setQueryType(query.getQueryType()); reportBomVO.setDataType(dataType); - parent.setBomRowId(parent.getRowId()); + if(Objects.nonNull(parent)) { + parent.setBomRowId(parent.getRowId()); + } reportBomVO.setParent(parent); reportBomVO.setChildNodes(childNode); return reportBomVO; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index 1e243684..c21c44ec 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -71,9 +71,9 @@ public class EBomForwardReport extends BaseForwardReport { List getParent() { QueryWrapper queryWrapper = buildQuery(); List list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper); - if (CollectionUtil.isEmpty(list)) { - throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); - } +// if (CollectionUtil.isEmpty(list)) { +// throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); +// } return list; @@ -108,13 +108,15 @@ public class EBomForwardReport extends BaseForwardReport { ReportBomVO singleReport() { List listParent = getParent(); - BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewEbomParentFormalEntity parentFormal0 = null; + List nodesList = new ArrayList<>(); for (BomNewEbomParentFormalEntity parentFormal : listParent) { - + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List parentChildList = SpringUtil.getBean(BomNewEbomParentFormalService.class).getParentChild(parentFormal.getRowId()); initMaterialInfo(parentChildList); @@ -172,7 +174,7 @@ public class EBomForwardReport extends BaseForwardReport { nodesList.addAll(nodeList); } - + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO, nodesList); } @@ -246,12 +248,14 @@ public class EBomForwardReport extends BaseForwardReport { List listParent = getParent(); - BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewEbomParentFormalEntity parentFormal0 = null; + List nodesList = new ArrayList<>(); for (BomNewEbomParentFormalEntity parentFormal : listParent) { - + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List bomList = bomDetailList(parentFormal.getRowId()); if(CollUtil.isEmpty(bomList)){ @@ -274,6 +278,7 @@ public class EBomForwardReport extends BaseForwardReport { } + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO, nodesList, query.getDataType()); @@ -288,12 +293,15 @@ public class EBomForwardReport extends BaseForwardReport { */ ReportBomVO sumReport() { List listParent = getParent(); - BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewEbomParentFormalEntity parentFormal0 = null; + List nodesList = new ArrayList<>(); for (BomNewEbomParentFormalEntity parentFormal : listParent) { + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List bomList = bomDetailList(parentFormal.getRowId()); if(CollUtil.isEmpty(bomList)){ continue; @@ -314,10 +322,11 @@ public class EBomForwardReport extends BaseForwardReport { vo.setLevelNum(1); vo.setOrderNumber(orderNum.incrementAndGet() + ""); vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); - vo.setDeviseName(forwardReportVO.getDeviseName()); + vo.setDeviseName(parentFormal0.getDeviseName()); } } + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO, nodesList); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index ca775d2b..4491b448 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -76,9 +76,9 @@ public class PBomForwardReport extends BaseForwardReport { List getParent() { QueryWrapper queryWrapper = buildQuery(); List list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper); - if (CollectionUtil.isEmpty(list)) { - throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); - } +// if (CollectionUtil.isEmpty(list)) { +// throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); +// } return list; @@ -113,13 +113,17 @@ public class PBomForwardReport extends BaseForwardReport { List< BomNewPbomParentFormalEntity> listParent=getParent(); - BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewPbomParentFormalEntity parentFormal0=null; + + + List nodesList=new ArrayList<>(); for (BomNewPbomParentFormalEntity parentFormal: listParent ) { - + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List parentChildList = SpringUtil.getBean(BomNewPbomParentFormalService.class).getParentChild(parentFormal.getRowId()); initMaterialInfo(parentChildList); @@ -172,6 +176,7 @@ public class PBomForwardReport extends BaseForwardReport { }, parentChildList); nodesList.addAll(nodeList); } + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO,nodesList); } @@ -247,14 +252,16 @@ public class PBomForwardReport extends BaseForwardReport { List< BomNewPbomParentFormalEntity> listParent=getParent(); - BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewPbomParentFormalEntity parentFormal0=null; + List nodesList=new ArrayList<>(); for (BomNewPbomParentFormalEntity parentFormal: listParent ) { - + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List bomList = bomDetailList(parentFormal.getRowId()); if(CollUtil.isEmpty(bomList)){ @@ -280,7 +287,7 @@ public class PBomForwardReport extends BaseForwardReport { } } - + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO,nodesList,query.getDataType()); } @@ -294,13 +301,15 @@ public class PBomForwardReport extends BaseForwardReport { ReportBomVO sumReport() { List< BomNewPbomParentFormalEntity> listParent=getParent(); - BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + BomNewPbomParentFormalEntity parentFormal0=null; + List nodesList=new ArrayList<>(); for (BomNewPbomParentFormalEntity parentFormal: listParent ) { - + if(Objects.isNull(parentFormal0)){ + parentFormal0=parentFormal; + } List bomList = bomDetailList(parentFormal.getRowId()); @@ -317,13 +326,14 @@ public class PBomForwardReport extends BaseForwardReport { for (ForwardReportVO vo : nodeList) { vo.setOrderNumber(noNum + ""); noNum++; - vo.setDeviseName(forwardReportVO.getDeviseName()); + vo.setDeviseName(parentFormal0.getDeviseName()); vo.setCreatedTime(parentFormal.getCreatedTime()); vo.setExpireEndTime(parentFormal.getReleaseTime()); } } + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); return buildReportBomVo(forwardReportVO,nodesList); }