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

转PBOM-覆盖模式时，取消创建人是否同一人的判断

This commit is contained in:
luoliming 2024-08-08 22:30:15 +08:00
parent a896dbd22e
commit e3a07d0971
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
View File

@ -178,14 +178,14 @@ public abstract class EBomToPbomBase {
} }
//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())) {
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.getRowId()); oldParent.setSourceRowId(parentVo.getRowId());
oldParent.setCreatedTime(LocalDateTime.now()); oldParent.setCreatedTime(LocalDateTime.now());
this.pBomParentResult.add(oldParent); this.pBomParentResult.add(oldParent);
return oldParent; return oldParent;
} // }
} else { } else {
// 降parentVo 及其子节点标记为不转换 // 降parentVo 及其子节点标记为不转换