diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 3f6dc5d9..f362c2b4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -66,6 +66,8 @@ public interface BomNewEbomParentMapper extends BaseMapper eBomReverseReport(@Param("bomVersionRowId")Long bomVersionRowId,@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("materialNo")String materialNo); + + List eBomReverseReportNewst(@Param("materialNo")String materialNo); Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo); void updateRootForWaitReview(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java index 105fad22..30213380 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java @@ -57,6 +57,7 @@ public class EBomQueryService { public List singleLevelReport(ReverseReportQuery queryParam) { Long bomVersionRowId=0L; //指定版本 + List vos=new ArrayList<>(); if (queryParam.getVersionStrategy().equals(2) || (queryParam.getVersionStrategy().equals(1) && StrUtil.isNotBlank(queryParam.getBomVersion()))) { BomNewEbomParentFormalEntity one = ebomParentFormalService.lambdaQuery() @@ -64,6 +65,8 @@ public class EBomQueryService { .eq(BomNewEbomParentFormalEntity::getCurrentVersion, queryParam.getBomVersion()) .one(); bomVersionRowId = Objects.nonNull(one) ? one.getRowId() : 0L; + + vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo()); }//最新版本 else if (queryParam.getVersionStrategy().equals(0)) { BomNewEbomParentEntity one = ebomParentService.lambdaQuery() @@ -73,8 +76,8 @@ public class EBomQueryService { if (Objects.nonNull(one)) { bomVersionRowId = one.getRowId(); } + vos = ebomParentService.getBaseMapper().eBomReverseReportNewst(queryParam.getMaterialNo()); } - List vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo()); if (CollUtil.isNotEmpty(vos)) { List materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList())); vos.forEach(it -> { diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 19756e84..89822826 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -365,6 +365,13 @@ and a.material_no =#{materialNo} + + +