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

feat(pbom): 修复获取节点异常状态问题

This commit is contained in:
曹鹏飞 2024-10-06 19:48:28 +08:00
parent 1985ad0f5b
commit 87ce4de0fb
2 changed files with 10 additions and 6 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/ReverseReport/EBomQueryService.java
View File

@ -164,7 +164,7 @@ public class EBomQueryService {
&& Objects.equals(v.getNum(), it.getNum()) && Objects.equals(v.getNum(), it.getNum())
&& StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit()) && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
&& StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) { && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1))); vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
} }
bindData(it, level + 1, vos); bindData(it, level + 1, vos);
} }
@ -175,15 +175,17 @@ public class EBomQueryService {
return ebomParentService.getReverseBoms(parentRowId); return ebomParentService.getReverseBoms(parentRowId);
} }
private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) { private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO); ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
vo.setLevelNum(level); vo.setLevelNum(level);
if (Objects.isNull(lastVO)) { if (Objects.isNull(lastVO)) {
vo.setBomVersion("1"); vo.setBomVersion("1");
vo.setChildNum(pVO.getNum());
vo.setChildMaterialUnit(pVO.getMaterialUnit());
} else { } else {
vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
vo.setChildNum(lastVO.getNum()); vo.setChildNum(lastVO.getNum());
vo.setChildMaterialUnit(lastVO.getChildMaterialUnit()); vo.setChildMaterialUnit(lastVO.getMaterialUnit());
} }
return vo; return vo;
} }

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

@ -158,7 +158,7 @@ public class PBomQueryService {
&& Objects.equals(v.getNum(), it.getNum()) && Objects.equals(v.getNum(), it.getNum())
&& StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit()) && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
&& StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) { && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1))); vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
} }
bindData(it, level + 1, vos); bindData(it, level + 1, vos);
} }
@ -169,15 +169,17 @@ public class PBomQueryService {
return pbomParentService.getReverseBoms(parentRowId); return pbomParentService.getReverseBoms(parentRowId);
} }
private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) { private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO); ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
vo.setLevelNum(level); vo.setLevelNum(level);
if (Objects.isNull(lastVO)) { if (Objects.isNull(lastVO)) {
vo.setBomVersion("1"); vo.setBomVersion("1");
vo.setChildNum(pVO.getNum());
vo.setChildMaterialUnit(pVO.getMaterialUnit());
} else { } else {
vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
vo.setChildNum(lastVO.getNum()); vo.setChildNum(lastVO.getNum());
vo.setChildMaterialUnit(lastVO.getChildMaterialUnit()); vo.setChildMaterialUnit(lastVO.getMaterialUnit());
} }
return vo; return vo;
} }