From 9a92cb535de73c6da586c5c406fdbdbe938d7465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 27 Jun 2024 15:53:51 +0800 Subject: [PATCH] =?UTF-8?q?optimize(pbom=E6=9F=A5=E7=9C=8B):=20=E6=9F=A5?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/PBom/PBomForwardReport.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) 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 4b40a383..3af44cf6 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 @@ -7,7 +7,6 @@ import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.OriginalConstant; import com.nflg.product.bomnew.constant.ReportConstant; @@ -23,7 +22,6 @@ import com.nflg.product.bomnew.service.domain.BaseForwardReport; import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil; import com.nflg.product.bomnew.util.VersionUtil; -import nflg.product.common.constant.STATE; import java.util.ArrayList; import java.util.List; @@ -196,20 +194,20 @@ public class PBomForwardReport extends BaseForwardReport { queryWrapper.lambda().orderByAsc(BomNewPbomParentFormalEntity::getCurrentVersion); List list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper); - if (CollectionUtil.isEmpty(list)) { - throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码{}版本信息", query.getMaterialNo())); - } - - BomNewPbomParentFormalEntity item0 = list.get(0); + // if (CollectionUtil.isEmpty(list)) { + // throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码{}版本信息", query.getMaterialNo())); + // } ReportBomVersionVO reportBomVersionVO = new ReportBomVersionVO(); - reportBomVersionVO.setMaterialDesc(item0.getMaterialDesc()); - reportBomVersionVO.setVList(new ArrayList<>()); - for (BomNewPbomParentFormalEntity entity : - list) { - ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); - versionVO.setVersion(entity.getCurrentVersion()); - versionVO.setVersionDesc(entity.getCurrentVersion()); - reportBomVersionVO.getVList().add(versionVO); + if (CollUtil.isNotEmpty(list)) { + BomNewPbomParentFormalEntity item0 = list.get(0); + reportBomVersionVO.setMaterialDesc(item0.getMaterialDesc()); + reportBomVersionVO.setVList(new ArrayList<>()); + for (BomNewPbomParentFormalEntity entity : list) { + ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); + versionVO.setVersion(entity.getCurrentVersion()); + versionVO.setVersionDesc(entity.getCurrentVersion()); + reportBomVersionVO.getVList().add(versionVO); + } } return reportBomVersionVO; }