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

EBOM-最新版反查

This commit is contained in:
大米 2024-07-22 12:32:03 +08:00
parent 56c9ed0a66
commit a9cf538ba9
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
View File

@ -66,6 +66,8 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
Integer checkIsUserRoot(@Param("materialNo")String materialNo, @Param("jobNo")String jobNo); Integer checkIsUserRoot(@Param("materialNo")String materialNo, @Param("jobNo")String jobNo);
List<ReverseReportVO> eBomReverseReport(@Param("bomVersionRowId")Long bomVersionRowId,@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("materialNo")String materialNo); List<ReverseReportVO> eBomReverseReport(@Param("bomVersionRowId")Long bomVersionRowId,@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("materialNo")String materialNo);
List<ReverseReportVO> eBomReverseReportNewst(@Param("materialNo")String materialNo);
Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo); Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo);
void updateRootForWaitReview(); void updateRootForWaitReview();

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java
View File

@ -57,6 +57,7 @@ public class EBomQueryService {
public List<ReverseReportVO> singleLevelReport(ReverseReportQuery queryParam) { public List<ReverseReportVO> singleLevelReport(ReverseReportQuery queryParam) {
Long bomVersionRowId=0L; Long bomVersionRowId=0L;
//指定版本 //指定版本
List<ReverseReportVO> vos=new ArrayList<>();
if (queryParam.getVersionStrategy().equals(2) if (queryParam.getVersionStrategy().equals(2)
|| (queryParam.getVersionStrategy().equals(1) && StrUtil.isNotBlank(queryParam.getBomVersion()))) { || (queryParam.getVersionStrategy().equals(1) && StrUtil.isNotBlank(queryParam.getBomVersion()))) {
BomNewEbomParentFormalEntity one = ebomParentFormalService.lambdaQuery() BomNewEbomParentFormalEntity one = ebomParentFormalService.lambdaQuery()
@ -64,6 +65,8 @@ public class EBomQueryService {
.eq(BomNewEbomParentFormalEntity::getCurrentVersion, queryParam.getBomVersion()) .eq(BomNewEbomParentFormalEntity::getCurrentVersion, queryParam.getBomVersion())
.one(); .one();
bomVersionRowId = Objects.nonNull(one) ? one.getRowId() : 0L; bomVersionRowId = Objects.nonNull(one) ? one.getRowId() : 0L;
vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo());
}//最新版本 }//最新版本
else if (queryParam.getVersionStrategy().equals(0)) { else if (queryParam.getVersionStrategy().equals(0)) {
BomNewEbomParentEntity one = ebomParentService.lambdaQuery() BomNewEbomParentEntity one = ebomParentService.lambdaQuery()
@ -73,8 +76,8 @@ public class EBomQueryService {
if (Objects.nonNull(one)) { if (Objects.nonNull(one)) {
bomVersionRowId = one.getRowId(); bomVersionRowId = one.getRowId();
} }
vos = ebomParentService.getBaseMapper().eBomReverseReportNewst(queryParam.getMaterialNo());
} }
List<ReverseReportVO> vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo());
if (CollUtil.isNotEmpty(vos)) { if (CollUtil.isNotEmpty(vos)) {
List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList())); List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList()));
vos.forEach(it -> { vos.forEach(it -> {

7
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -365,6 +365,13 @@
and a.material_no =#{materialNo} and a.material_no =#{materialNo}
</select> </select>
<!--ebom单层反查-->
<select id="eBomReverseReportNewst" resultType="com.nflg.product.bomnew.pojo.vo.ReverseReportVO">
select b.* , a.drawing_no as childDrawingNo from t_bom_new_ebom_child a
join t_bom_new_ebom_parent b on a.parent_row_id=b.row_id
where a.material_no =#{materialNo} and b.status=4
</select>
<select id="getCountForWaitReviewByMaterialNo" resultType="java.lang.Integer"> <select id="getCountForWaitReviewByMaterialNo" resultType="java.lang.Integer">
select COUNT(1) select COUNT(1)
from t_bom_new_ebom_child from t_bom_new_ebom_child