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

1、 单层反查

This commit is contained in:
大米 2024-06-23 18:50:32 +08:00
parent 320dd02854
commit 5a16d05a0d
2 changed files with 4 additions and 4 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/EBomToPBomForFormal31.java
View File

@ -80,8 +80,8 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
check(); check();
//bom 提层 //bom 提层
liftingLayer(); liftingLayer();
result.forEach(u->u.setLevelNo("")); // result.forEach(u->u.setLevelNo(""));
generateDrawingNo(result, parent.getRowId(), "1"); // generateDrawingNo(result, parent.getRowId(), "1");
splitData(); splitData();
List<String> hasConvert = new ArrayList<>(); List<String> hasConvert = new ArrayList<>();

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

@ -167,8 +167,8 @@ 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() == parentVo.getCreatedBy()) { if (oldParent.getCreatedBy().equals( parentVo.getCreatedBy())) {
if (ConvertToPBomModelEnum.OVERRIDE.equals(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.setCurrentVersion(parentVo.getCurrentVersion()); oldParent.setCurrentVersion(parentVo.getCurrentVersion());
oldParent.setSourceRowId(parentVo.getRowId()); oldParent.setSourceRowId(parentVo.getRowId());