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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-09 08:16:39 +08:00
parent d5eab98ac5 a03a1bb28d
commit 1498f3974f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -405,6 +405,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
}
}
child.setChildBomRowId(child.getRowId());
}
}
}
@ -961,7 +962,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
lambdaUpdate().eq(BomNewEbomParentEntity::getRowId, rootBomRowId)
.set(BomNewEbomParentEntity::getSapTime, LocalDateTime.now())
.set(BomNewEbomParentEntity::getSapState, sapState)
.set(BomNewEbomParentEntity::getSapState, sapState.getValue())
.update();
}
@ -1562,7 +1563,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
parentVO.setBomRowId(parentVO.getRowId());
parentVO.setProjectType(projectType);
parentVO.setParentRowId(0l);
parentVO.setParentRowId(0L);
parentVO.setChildBomRowId(rowId);
materialMainService.intiMaterialInfo(ImmutableList.of(parentVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
vo.setDatas(getChild(bomRowId));
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
View File

@ -319,7 +319,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
lambdaUpdate().eq(BomNewMbomParentEntity::getRowId, rootBomRowId)
.set(BomNewMbomParentEntity::getSysnSapTime, LocalDateTime.now())
.set(BomNewMbomParentEntity::getStatus, sapState)
.set(BomNewMbomParentEntity::getStatus, sapState.getValue())
.update();
}
}

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
View File

@ -379,6 +379,9 @@ public class DQBomImportService {
dQbomExcelVO.setProjectType(BomConstant.PROJECT_TYPE_TEMPORARY);
}
dQbomExcelVO.setCurrentVersion("");
if (StrUtil.isBlank(dQbomExcelVO.getProjectType())) {
dQbomExcelVO.setProjectType("L");
}
excelContextTL.get().add(dQbomExcelVO);
}