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

叶子节点无bom带上设计人员信息

This commit is contained in:
jing's 2024-07-08 09:20:59 +08:00
parent 8a9afaf8da
commit 3f48c37801
2 changed files with 8 additions and 8 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/domain/EBom/EBomForwardReport.java
View File

@ -185,7 +185,7 @@ public class EBomForwardReport extends BaseForwardReport {
bom 子级同步有bom版本号 bom 子级同步有bom版本号
*/ */
void bomUpAndLowLevel(List<BomNewEbomParentVO> parent, List<BomNewEbomParentVO> parentChildList, List<BomNewEbomParentVO> backList, int levelNum, AtomicInteger orderNum) { void bomUpAndLowLevel(List<BomNewEbomParentVO> parent, List<BomNewEbomParentVO> parentChildList, List<BomNewEbomParentVO> backPreList, int levelNum, AtomicInteger orderNum) {
if (CollectionUtil.isNotEmpty(parentChildList)) { if (CollectionUtil.isNotEmpty(parentChildList)) {
@ -195,9 +195,9 @@ public class EBomForwardReport extends BaseForwardReport {
Map<Long, BomNewEbomParentVO> parentEntityMap = null; Map<Long, BomNewEbomParentVO> parentEntityMap = null;
if (CollUtil.isNotEmpty(bomRowIds)) { if (CollUtil.isNotEmpty(bomRowIds)) {
List<BomNewEbomParentVO> bomlist = getParentList(bomRowIds); List<BomNewEbomParentVO> bomlist = getParentList(bomRowIds);
if (CollUtil.isNotEmpty(backList)) { if (Objects.nonNull(backPreList)) {
backList.clear(); backPreList.clear();
backList.addAll(bomlist); backPreList.addAll(bomlist);
} }
parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewEbomParentVO::getRowId); parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewEbomParentVO::getRowId);
} }

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

@ -372,7 +372,7 @@ public class PBomForwardReport extends BaseForwardReport {
bom 子级同步有bom版本号 bom 子级同步有bom版本号
*/ */
void bomUpAndLowLevel(List<BomNewPbomParentVO> parent, List<BomNewPbomParentVO> parentChildList, List<BomNewPbomParentVO> backList, int levelNum, AtomicInteger orderNum) { void bomUpAndLowLevel(List<BomNewPbomParentVO> parent, List<BomNewPbomParentVO> parentChildList, List<BomNewPbomParentVO> backPreList, int levelNum, AtomicInteger orderNum) {
if (CollectionUtil.isNotEmpty(parentChildList)) { if (CollectionUtil.isNotEmpty(parentChildList)) {
@ -380,9 +380,9 @@ public class PBomForwardReport extends BaseForwardReport {
Map<Long, BomNewPbomParentVO> parentEntityMap = null; Map<Long, BomNewPbomParentVO> parentEntityMap = null;
if (CollUtil.isNotEmpty(bomRowIds)) { if (CollUtil.isNotEmpty(bomRowIds)) {
List<BomNewPbomParentVO> bomlist = getParentList(bomRowIds); List<BomNewPbomParentVO> bomlist = getParentList(bomRowIds);
if (CollUtil.isNotEmpty(backList)) { if (Objects.nonNull(backPreList)) {
backList.clear(); backPreList.clear();
backList.addAll(bomlist); backPreList.addAll(bomlist);
} }
parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewPbomParentVO::getRowId); parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewPbomParentVO::getRowId);
} }