diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java index a0412ed5..aa0a8c07 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java @@ -17,4 +17,6 @@ public interface BomNewOriginalChildMapper extends BaseMapper rowIds ,@Param("parentRowId") Long parentRowId); + + List selectMaterialParent(@Param("drawingNo") String drawingNo) ; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java index fa757535..318517eb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java @@ -1,6 +1,19 @@ package com.nflg.product.bomnew.service.domain.ReverseReport; +import cn.hutool.core.util.StrUtil; +import cn.hutool.db.sql.SqlBuilder; +import cn.hutool.extra.spring.SpringUtil; +import com.nflg.product.bomnew.constant.ReportConstant; +import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity; import com.nflg.product.bomnew.pojo.query.ReverseReportQuery; +import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; +import com.nflg.product.bomnew.service.BomNewOriginalChildService; +import com.nflg.product.bomnew.service.RedisService; +import org.omg.CORBA.PRIVATE_MEMBER; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 原始BOM-反查 @@ -11,7 +24,39 @@ public class OriginalBomQuery { */ private ReverseReportQuery queryParam; + /** + * 报表结果 + */ + private List reportResult; + + private RedisService redisService= SpringUtil.getBean(RedisService.class); + + private BomNewOriginalChildService originalChildService=SpringUtil.getBean(BomNewOriginalChildService.class); + public OriginalBomQuery(ReverseReportQuery inQueryParam){ this.queryParam=inQueryParam; } + + + public void report(){ + if(queryParam.getQueryType().equals(ReportConstant.QueryTypeEnum.SINGLE.getValue())){ + singleLevelReport(); + } + } + + /** + * 单层报表 + */ + public void singleLevelReport(){ + List parentRowIds = originalChildService.getBaseMapper().selectMaterialParent(queryParam.getDrawingNo()); + + + + + + } + + + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml index fc203870..6fdf03db 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml @@ -37,4 +37,11 @@ + + + +