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

转PBOM-重复问题

This commit is contained in:
大米 2024-03-01 15:03:08 +08:00
parent 607ed9d581
commit bd7f96b177
1 changed files with 3 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/domain/EBom/EBomToPBom.java
View File

@ -83,7 +83,7 @@ public class EBomToPBom {
check(); check();
//bom 提层 //bom 提层
liftingLayer(); liftingLayer();
List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus()<PBomStatusEnum.PUBLISH.getValue()).collect(Collectors.toList()); List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus()<EBomStatusEnum.PUBLISHED.getValue()).collect(Collectors.toList());
List<String> hasConvert=new ArrayList<>(); List<String> hasConvert=new ArrayList<>();
for (String facCode : facCodes) { for (String facCode : facCodes) {
@ -157,7 +157,7 @@ public class EBomToPBom {
private BomNewPbomParentEntity buildPBomParent(BomNewEbomParentVO parentVo, String facCode) { private BomNewPbomParentEntity buildPBomParent(BomNewEbomParentVO parentVo, String facCode) {
BomNewPbomParentEntity oldParent = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery() BomNewPbomParentEntity oldParent = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery()
.eq(BomNewPbomParentEntity::getMaterialNo, parentVo.getMaterialNo()) .eq(BomNewPbomParentEntity::getMaterialNo, parentVo.getMaterialNo())
.eq(BomNewPbomParentEntity::getFacCode, facCode).eq(BomNewPbomParentEntity::getLastVersionIs,1).one(); .eq(BomNewPbomParentEntity::getFacCode, facCode).last(" order by current_version desc limit 1").one();
// this.hasConvertEBomRowIds.add(parentVo.getRowId()); // this.hasConvertEBomRowIds.add(parentVo.getRowId());
if (Objects.nonNull(oldParent) && !EBomStatusEnum.PUBLISHED.equalsValue(oldParent.getStatus())) { if (Objects.nonNull(oldParent) && !EBomStatusEnum.PUBLISHED.equalsValue(oldParent.getStatus())) {
@ -176,7 +176,7 @@ public class EBomToPBom {
pBomParent.setTechnologyUserName(SessionUtil.getRealName()); pBomParent.setTechnologyUserName(SessionUtil.getRealName());
pBomParent.setCurrentVersion(VersionUtil.getNextVersion("")); pBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
if(Objects.nonNull(oldParent)){ if(Objects.nonNull(oldParent)){
parentVo.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion())); pBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
oldParent.setExpireEndTime(LocalDateTime.now()); oldParent.setExpireEndTime(LocalDateTime.now());
oldParent.setLastVersionIs(0); oldParent.setLastVersionIs(0);
} }