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

空数据不抛异常

This commit is contained in:
jing's 2024-06-27 16:40:25 +08:00
parent 80bf577fb6
commit 910f7d637a
3 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java
View File

@ -161,7 +161,9 @@ public abstract class BaseForwardReport {
reportBomVO.setBomType(query.getBomType()); reportBomVO.setBomType(query.getBomType());
reportBomVO.setQueryType(query.getQueryType()); reportBomVO.setQueryType(query.getQueryType());
reportBomVO.setDataType(dataType); reportBomVO.setDataType(dataType);
parent.setBomRowId(parent.getRowId()); if(Objects.nonNull(parent)) {
parent.setBomRowId(parent.getRowId());
}
reportBomVO.setParent(parent); reportBomVO.setParent(parent);
reportBomVO.setChildNodes(childNode); reportBomVO.setChildNodes(childNode);
return reportBomVO; return reportBomVO;

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

@ -71,9 +71,9 @@ public class EBomForwardReport extends BaseForwardReport {
List<BomNewEbomParentFormalEntity> getParent() { List<BomNewEbomParentFormalEntity> getParent() {
QueryWrapper<BomNewEbomParentFormalEntity> queryWrapper = buildQuery(); QueryWrapper<BomNewEbomParentFormalEntity> queryWrapper = buildQuery();
List<BomNewEbomParentFormalEntity> list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper); List<BomNewEbomParentFormalEntity> list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper);
if (CollectionUtil.isEmpty(list)) { // if (CollectionUtil.isEmpty(list)) {
throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); // throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
} // }
return list; return list;
@ -108,13 +108,15 @@ public class EBomForwardReport extends BaseForwardReport {
ReportBomVO singleReport() { ReportBomVO singleReport() {
List<BomNewEbomParentFormalEntity> listParent = getParent(); List<BomNewEbomParentFormalEntity> listParent = getParent();
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); BomNewEbomParentFormalEntity parentFormal0 = null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList = new ArrayList<>(); List<ForwardReportVO> nodesList = new ArrayList<>();
for (BomNewEbomParentFormalEntity parentFormal : listParent) { for (BomNewEbomParentFormalEntity parentFormal : listParent) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewEbomParentFormalVO> parentChildList = SpringUtil.getBean(BomNewEbomParentFormalService.class).getParentChild(parentFormal.getRowId()); List<BomNewEbomParentFormalVO> parentChildList = SpringUtil.getBean(BomNewEbomParentFormalService.class).getParentChild(parentFormal.getRowId());
initMaterialInfo(parentChildList); initMaterialInfo(parentChildList);
@ -172,7 +174,7 @@ public class EBomForwardReport extends BaseForwardReport {
nodesList.addAll(nodeList); nodesList.addAll(nodeList);
} }
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
return buildReportBomVo(forwardReportVO, nodesList); return buildReportBomVo(forwardReportVO, nodesList);
} }
@ -246,12 +248,14 @@ public class EBomForwardReport extends BaseForwardReport {
List<BomNewEbomParentFormalEntity> listParent = getParent(); List<BomNewEbomParentFormalEntity> listParent = getParent();
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); BomNewEbomParentFormalEntity parentFormal0 = null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList = new ArrayList<>(); List<ForwardReportVO> nodesList = new ArrayList<>();
for (BomNewEbomParentFormalEntity parentFormal : listParent) { for (BomNewEbomParentFormalEntity parentFormal : listParent) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewEbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId()); List<BomNewEbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId());
if(CollUtil.isEmpty(bomList)){ 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()); return buildReportBomVo(forwardReportVO, nodesList, query.getDataType());
@ -288,12 +293,15 @@ public class EBomForwardReport extends BaseForwardReport {
*/ */
ReportBomVO sumReport() { ReportBomVO sumReport() {
List<BomNewEbomParentFormalEntity> listParent = getParent(); List<BomNewEbomParentFormalEntity> listParent = getParent();
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); BomNewEbomParentFormalEntity parentFormal0 = null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList = new ArrayList<>(); List<ForwardReportVO> nodesList = new ArrayList<>();
for (BomNewEbomParentFormalEntity parentFormal : listParent) { for (BomNewEbomParentFormalEntity parentFormal : listParent) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewEbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId()); List<BomNewEbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId());
if(CollUtil.isEmpty(bomList)){ if(CollUtil.isEmpty(bomList)){
continue; continue;
@ -314,10 +322,11 @@ public class EBomForwardReport extends BaseForwardReport {
vo.setLevelNum(1); vo.setLevelNum(1);
vo.setOrderNumber(orderNum.incrementAndGet() + ""); vo.setOrderNumber(orderNum.incrementAndGet() + "");
vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); vo.setExpireEndTime(parentFormal.getConvertToEbomTime());
vo.setDeviseName(forwardReportVO.getDeviseName()); vo.setDeviseName(parentFormal0.getDeviseName());
} }
} }
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
return buildReportBomVo(forwardReportVO, nodesList); return buildReportBomVo(forwardReportVO, nodesList);
} }

38
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
View File

@ -76,9 +76,9 @@ public class PBomForwardReport extends BaseForwardReport {
List<BomNewPbomParentFormalEntity> getParent() { List<BomNewPbomParentFormalEntity> getParent() {
QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery(); QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery();
List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper); List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
if (CollectionUtil.isEmpty(list)) { // if (CollectionUtil.isEmpty(list)) {
throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); // throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
} // }
return list; return list;
@ -113,13 +113,17 @@ public class PBomForwardReport extends BaseForwardReport {
List< BomNewPbomParentFormalEntity> listParent=getParent(); List< BomNewPbomParentFormalEntity> listParent=getParent();
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); BomNewPbomParentFormalEntity parentFormal0=null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList=new ArrayList<>(); List<ForwardReportVO> nodesList=new ArrayList<>();
for (BomNewPbomParentFormalEntity parentFormal: for (BomNewPbomParentFormalEntity parentFormal:
listParent ) { listParent ) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewPbomParentFormalVO> parentChildList = SpringUtil.getBean(BomNewPbomParentFormalService.class).getParentChild(parentFormal.getRowId()); List<BomNewPbomParentFormalVO> parentChildList = SpringUtil.getBean(BomNewPbomParentFormalService.class).getParentChild(parentFormal.getRowId());
initMaterialInfo(parentChildList); initMaterialInfo(parentChildList);
@ -172,6 +176,7 @@ public class PBomForwardReport extends BaseForwardReport {
}, parentChildList); }, parentChildList);
nodesList.addAll(nodeList); nodesList.addAll(nodeList);
} }
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
return buildReportBomVo(forwardReportVO,nodesList); return buildReportBomVo(forwardReportVO,nodesList);
} }
@ -247,14 +252,16 @@ public class PBomForwardReport extends BaseForwardReport {
List< BomNewPbomParentFormalEntity> listParent=getParent(); List< BomNewPbomParentFormalEntity> listParent=getParent();
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); BomNewPbomParentFormalEntity parentFormal0=null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList=new ArrayList<>(); List<ForwardReportVO> nodesList=new ArrayList<>();
for (BomNewPbomParentFormalEntity parentFormal: for (BomNewPbomParentFormalEntity parentFormal:
listParent ) { listParent ) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewPbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId()); List<BomNewPbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId());
if(CollUtil.isEmpty(bomList)){ 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()); return buildReportBomVo(forwardReportVO,nodesList,query.getDataType());
} }
@ -294,13 +301,15 @@ public class PBomForwardReport extends BaseForwardReport {
ReportBomVO sumReport() { ReportBomVO sumReport() {
List< BomNewPbomParentFormalEntity> listParent=getParent(); List< BomNewPbomParentFormalEntity> listParent=getParent();
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); BomNewPbomParentFormalEntity parentFormal0=null;
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
List<ForwardReportVO> nodesList=new ArrayList<>(); List<ForwardReportVO> nodesList=new ArrayList<>();
for (BomNewPbomParentFormalEntity parentFormal: for (BomNewPbomParentFormalEntity parentFormal:
listParent ) { listParent ) {
if(Objects.isNull(parentFormal0)){
parentFormal0=parentFormal;
}
List<BomNewPbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId()); List<BomNewPbomParentFormalVO> bomList = bomDetailList(parentFormal.getRowId());
@ -317,13 +326,14 @@ public class PBomForwardReport extends BaseForwardReport {
for (ForwardReportVO vo : nodeList) { for (ForwardReportVO vo : nodeList) {
vo.setOrderNumber(noNum + ""); vo.setOrderNumber(noNum + "");
noNum++; noNum++;
vo.setDeviseName(forwardReportVO.getDeviseName()); vo.setDeviseName(parentFormal0.getDeviseName());
vo.setCreatedTime(parentFormal.getCreatedTime()); vo.setCreatedTime(parentFormal.getCreatedTime());
vo.setExpireEndTime(parentFormal.getReleaseTime()); vo.setExpireEndTime(parentFormal.getReleaseTime());
} }
} }
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
return buildReportBomVo(forwardReportVO,nodesList); return buildReportBomVo(forwardReportVO,nodesList);
} }