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

正查子级版本号

This commit is contained in:
jing's 2024-08-06 11:11:42 +08:00
parent 09c2b1c8ee
commit cffe58bfec
5 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,12 +218,19 @@ public class ForwardReportService {
BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getMaterialNo()); BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getMaterialNo());
vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseName(ebomParentEntity.getDeviseName());
vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode());
// vo.setCreatedBy(ebomParentEntity.getCreatedBy());
vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion());
vo.setExpireEndTime(ebomParentEntity.getConvertToEbomTime()); vo.setExpireEndTime(ebomParentEntity.getExpireEndTime());
vo.setBomRowId(ebomParentEntity.getRowId()); vo.setBomRowId(ebomParentEntity.getRowId());
}else{ }else{
if(Objects.nonNull(parentEntity)) {
vo.setDeviseName(parentEntity.getDeviseName()); vo.setDeviseName(parentEntity.getDeviseName());
vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); vo.setDeviseUserCode(parentEntity.getDeviseUserCode());
// vo.setCreatedBy(parentEntity.getCreatedBy());
vo.setCurrentVersion(parentEntity.getCurrentVersion());
vo.setExpireEndTime(parentEntity.getExpireEndTime());
}
// if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
// vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
// } // }
@ -299,13 +306,19 @@ public class ForwardReportService {
if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getMaterialNo())) { if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getMaterialNo())) {
BomNewPbomParentVO pbomParentEntity = parentEntityMap.get(vo.getMaterialNo()); BomNewPbomParentVO pbomParentEntity = parentEntityMap.get(vo.getMaterialNo());
vo.setDeviseName(pbomParentEntity.getDeviseName()); vo.setDeviseName(pbomParentEntity.getDeviseName());
vo.setDeviseUserCode(pbomParentEntity.getDeviseUserCode());
vo.setCurrentVersion(pbomParentEntity.getCurrentVersion()); vo.setCurrentVersion(pbomParentEntity.getCurrentVersion());
vo.setExpireEndTime(pbomParentEntity.getReleaseTime()); vo.setExpireEndTime(pbomParentEntity.getExpireEndTime());
// vo.setCreatedBy(pbomParentEntity.getCreatedBy());
}else{ }else{
vo.setExpireEndTime(parentEntity.getReleaseTime()); if(Objects.nonNull(parentEntity)) {
vo.setDeviseName(parentEntity.getDeviseName()); vo.setDeviseName(parentEntity.getDeviseName());
vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); vo.setDeviseUserCode(parentEntity.getDeviseUserCode());
vo.setExpireEndTime(parentEntity.getExpireEndTime());
vo.setCurrentVersion(parentEntity.getCurrentVersion());
// vo.setCreatedBy(parentEntity.getCreatedBy());
}
// if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
// vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
// } // }

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

@ -90,7 +90,8 @@ public class EBomFormalTreeTask extends RecursiveTask<List<BomNewEbomParentVO>>
detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setBomExist(ebomParentEntity.getBomExist());
detailVO.setStatus(ebomParentEntity.getStatus()); detailVO.setStatus(ebomParentEntity.getStatus());
detailVO.setBatchNo(ebomParentEntity.getBatchNo()); detailVO.setBatchNo(ebomParentEntity.getBatchNo());
detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); // detailVO.setCreatedBy(ebomParentEntity.getCreatedBy());
detailVO.setExpireEndTime(ebomParentEntity.getExpireEndTime());
}else { }else {
BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getRowId, detailVO.getParentRowId()).one(); BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getRowId, detailVO.getParentRowId()).one();
@ -102,7 +103,10 @@ public class EBomFormalTreeTask extends RecursiveTask<List<BomNewEbomParentVO>>
detailVO.setStatus(parent.getStatus()); detailVO.setStatus(parent.getStatus());
detailVO.setEditStatus(parent.getEditStatus()); detailVO.setEditStatus(parent.getEditStatus());
detailVO.setVirtualPackageIs(parent.getVirtualPackageIs()); detailVO.setVirtualPackageIs(parent.getVirtualPackageIs());
// detailVO.setCurrentVersion()
// detailVO.setCreatedBy(parent.getCreatedBy());
detailVO.setCurrentVersion(parent.getCurrentVersion());
detailVO.setExpireEndTime(parent.getExpireEndTime());
} }
} }

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

@ -209,15 +209,16 @@ public class EBomForwardReport extends BaseForwardReport {
if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getBomRowId())) { if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getBomRowId())) {
// vo.setCreatedTime(forwardReportVO.getCreatedTime()); // vo.setCreatedTime(forwardReportVO.getCreatedTime());
// vo.setExpireEndTime(parentFormal.getConvertToEbomTime());
BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getBomRowId()); BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getBomRowId());
vo.setLevelNum(levelNum); vo.setLevelNum(levelNum);
vo.setOrderNumber(orderNum.getAndIncrement() + ""); vo.setOrderNumber(orderNum.getAndIncrement() + "");
vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseName(ebomParentEntity.getDeviseName());
vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode());
// vo.setCreatedBy(ebomParentEntity.getCreatedBy());
vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion());
vo.setExpireEndTime(ebomParentEntity.getExpireEndTime());
} else { } else {
vo.setLevelNum(levelNum); vo.setLevelNum(levelNum);
vo.setOrderNumber(orderNum.getAndIncrement() + ""); vo.setOrderNumber(orderNum.getAndIncrement() + "");
@ -225,6 +226,9 @@ public class EBomForwardReport extends BaseForwardReport {
BomNewEbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId()); BomNewEbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId());
vo.setDeviseName(parentVO.getDeviseName()); vo.setDeviseName(parentVO.getDeviseName());
vo.setDeviseUserCode(parentVO.getDeviseUserCode()); vo.setDeviseUserCode(parentVO.getDeviseUserCode());
// vo.setCreatedBy(parentVO.getCreatedBy());
vo.setCurrentVersion(parentVO.getCurrentVersion());
vo.setExpireEndTime(parentVO.getExpireEndTime());
} }
// if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
@ -481,7 +485,7 @@ public class EBomForwardReport extends BaseForwardReport {
nodeList) { nodeList) {
vo.setBomVersion(parentFormal.getCurrentVersion()); vo.setBomVersion(parentFormal.getCurrentVersion());
// vo.setDeviseName(parentFormal.getDeviseName()); // vo.setDeviseName(parentFormal.getDeviseName());
vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); // vo.setExpireEndTime(parentFormal.getConvertToEbomTime());
} }
nodesList.addAll(nodeList); nodesList.addAll(nodeList);

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
View File

@ -110,7 +110,9 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
detailVO.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); detailVO.setDeviseUserCode(ebomParentEntity.getDeviseUserCode());
detailVO.setCreatedTime(ebomParentEntity.getCreatedTime()); detailVO.setCreatedTime(ebomParentEntity.getCreatedTime());
detailVO.setCreatedBy(ebomParentEntity.getCreatedBy());
detailVO.setExpireEndTime(ebomParentEntity.getExpireEndTime());
// detailVO.setCreatedBy(ebomParentEntity.getCreatedBy());
detailVO.setDeptName(ebomParentEntity.getDeptName()); detailVO.setDeptName(ebomParentEntity.getDeptName());
detailVO.setDeptRowId(ebomParentEntity.getDeptRowId()); detailVO.setDeptRowId(ebomParentEntity.getDeptRowId());
@ -125,11 +127,14 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
if(Objects.nonNull(parent)) { if(Objects.nonNull(parent)) {
detailVO.setDeviseUserCode(parent.getDeviseUserCode()); detailVO.setDeviseUserCode(parent.getDeviseUserCode());
detailVO.setDeviseName(parent.getDeviseName()); detailVO.setDeviseName(parent.getDeviseName());
// detailVO.setCreatedBy(parent.getCreatedBy());
detailVO.setDeptName(parent.getDeptName()); detailVO.setDeptName(parent.getDeptName());
detailVO.setDeptRowId(parent.getDeptRowId()); detailVO.setDeptRowId(parent.getDeptRowId());
detailVO.setStatus(parent.getStatus()); detailVO.setStatus(parent.getStatus());
detailVO.setEditStatus(parent.getEditStatus()); detailVO.setEditStatus(parent.getEditStatus());
detailVO.setVirtualPackageIs(parent.getVirtualPackageIs()); detailVO.setVirtualPackageIs(parent.getVirtualPackageIs());
detailVO.setExpireEndTime(parent.getExpireEndTime());
detailVO.setCurrentVersion(parent.getCurrentVersion());
} }

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

@ -412,7 +412,9 @@ public class PBomForwardReport extends BaseForwardReport {
vo.setOrderNumber(orderNum.getAndIncrement() + ""); vo.setOrderNumber(orderNum.getAndIncrement() + "");
vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseName(ebomParentEntity.getDeviseName());
vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode());
// vo.setCreatedBy(ebomParentEntity.getCreatedBy());
vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion());
vo.setExpireEndTime(ebomParentEntity.getExpireEndTime());
} else { } else {
vo.setLevelNum(levelNum); vo.setLevelNum(levelNum);
@ -422,7 +424,9 @@ public class PBomForwardReport extends BaseForwardReport {
BomNewPbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId()); BomNewPbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId());
vo.setDeviseName(parentVO.getDeviseName()); vo.setDeviseName(parentVO.getDeviseName());
vo.setDeviseUserCode(parentVO.getDeviseUserCode()); vo.setDeviseUserCode(parentVO.getDeviseUserCode());
// vo.setCreatedBy(parentVO.getCreatedBy());
vo.setCurrentVersion(parentVO.getCurrentVersion());
vo.setExpireEndTime(parentVO.getExpireEndTime());
} }