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

Merge remote-tracking branch 'origin/DM/nflg-新需求' into DM/nflg-新需求

This commit is contained in:
luolm 2024-09-23 21:47:57 +08:00
parent 3d7128d95c ec497a742c
commit 79504b297d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1200,6 +1200,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
// newPBom.setCurrentVersion(VersionUtil.getNextVersion(""));
continue;
}
if(StrUtil.isNotBlank(newPBom.getEbomVersion()) ){
continue;
}
//旧bom除T项之外
List<BomNewPbomParentVO> oldBomDetail = this.getBaseMapper().getParentChild(oldParent.getRowId());
List<BomNewPbomParentVO> oldBomNoTChildren = oldBomDetail.stream().filter(u -> !EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(u.getProjectType())).collect(Collectors.toList());

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

@ -200,6 +200,10 @@ public abstract class FormalEBomToPbomBase {
oldParent.setCreatedBy(SessionUtil.getUserCode());
oldParent.setDeptName(SessionUtil.getDepartName());
oldParent.setDeptRowId(SessionUtil.getDepartRowId());
if(StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
oldParent.setCurrentVersion(parentVo.getCurrentVersion());
oldParent.setEbomVersion(parentVo.getCurrentVersion());
}
this.pBomParentResult.add(oldParent);
return oldParent;
}
@ -316,6 +320,11 @@ public abstract class FormalEBomToPbomBase {
pBomParent.setCreatedBy(SessionUtil.getUserCode());
pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
//EBOM版本大于pbom版本则用EBOm版本
if(oldParent!=null && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
}
if (Objects.nonNull(oldParent)) {
oldParent.setExpireEndTime(LocalDateTime.now());
oldParent.setLastVersionIs(0);