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

Merge remote-tracking branch 'origin/DM/-bug修复-2' into test

This commit is contained in:
10001392 2024-09-25 09:37:28 +08:00
parent 5f8e482a0b b55474a9f8
commit 95941e1e32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ public abstract class FormalEBomToPbomBase {
pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue()); pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue()); pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
//EBOM版本大于pbom版本则用EBOm版本 //EBOM版本大于pbom版本则用EBOm版本
if(oldParent!=null && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){ if( oldParent!=null && StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
pBomParent.setCurrentVersion(parentVo.getCurrentVersion()); pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
pBomParent.setCurrentVersion(parentVo.getCurrentVersion()); pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
} }