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

比对根节点不比较

This commit is contained in:
jing's 2024-07-06 22:30:23 +08:00
parent bd41892bbc
commit 13fd8df3f4
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java
View File

@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
@ -318,6 +319,11 @@ public class CompareReportService {
} }
//多层比较父级物料编码/图号 //多层比较父级物料编码/图号
if (queryType.compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0) { if (queryType.compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0) {
//根节点下面不用比较
if ( (Objects.nonNull(from.getParentRowId()) &&from.getParentRowId()>0)
&& (Objects.nonNull(to.getParentRowId()) &&to.getParentRowId()>0) ) {
if (CollUtil.isEmpty(leftBomRowIdMap.get(from.getParentRowId())) if (CollUtil.isEmpty(leftBomRowIdMap.get(from.getParentRowId()))
|| CollUtil.isEmpty(rightBomRowIdMap.get(to.getParentRowId()))) { || CollUtil.isEmpty(rightBomRowIdMap.get(to.getParentRowId()))) {
compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue()); compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue());
@ -331,6 +337,8 @@ public class CompareReportService {
continue; continue;
} }
}
} else { } else {
//比较单位 //比较单位
if (!ObjectUtil.equal(from.getMaterialUnit().toUpperCase(), to.getMaterialUnit().toUpperCase())) { if (!ObjectUtil.equal(from.getMaterialUnit().toUpperCase(), to.getMaterialUnit().toUpperCase())) {