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

转PBOM-虚拟包处理

This commit is contained in:
大米 2024-09-10 15:43:22 +08:00
parent 6d2abfa7a8
commit 94e04540ac
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
View File

@ -192,22 +192,22 @@ public abstract class FormalEBomToPbomBase {
//pbom 处于工作表 //pbom 处于工作表
else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) { else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
//if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) { //if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) {
// if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) { if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
// if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy()) || VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0) { if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy()) || VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0) {
// SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId())); SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
// oldParent.setSourceRowId(parentVo.getBomRowId()); oldParent.setSourceRowId(parentVo.getBomRowId());
// oldParent.setCreatedTime(LocalDateTime.now()); oldParent.setCreatedTime(LocalDateTime.now());
// oldParent.setCreatedBy(SessionUtil.getUserCode()); oldParent.setCreatedBy(SessionUtil.getUserCode());
// oldParent.setDeptName(SessionUtil.getDepartName()); oldParent.setDeptName(SessionUtil.getDepartName());
// oldParent.setDeptRowId(SessionUtil.getDepartRowId()); oldParent.setDeptRowId(SessionUtil.getDepartRowId());
// this.pBomParentResult.add(oldParent); this.pBomParentResult.add(oldParent);
// return oldParent; return oldParent;
// } }
//
// } else { } else {
// // 降parentVo 及其子节点标记为不转换 // 降parentVo 及其子节点标记为不转换
// markNoConvert(parentVo, parentList); markNoConvert(parentVo, parentList);
// } }
return null; return null;
} else { //pbom-处于正式表(全部生成小版本) } else { //pbom-处于正式表(全部生成小版本)