diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java index 3c6e741c..d670d798 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java @@ -218,12 +218,19 @@ public class ForwardReportService { BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getMaterialNo()); vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); + // vo.setCreatedBy(ebomParentEntity.getCreatedBy()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); - vo.setExpireEndTime(ebomParentEntity.getConvertToEbomTime()); + vo.setExpireEndTime(ebomParentEntity.getExpireEndTime()); vo.setBomRowId(ebomParentEntity.getRowId()); + }else{ - vo.setDeviseName(parentEntity.getDeviseName()); - vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); + if(Objects.nonNull(parentEntity)) { + vo.setDeviseName(parentEntity.getDeviseName()); + vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); + // vo.setCreatedBy(parentEntity.getCreatedBy()); + vo.setCurrentVersion(parentEntity.getCurrentVersion()); + vo.setExpireEndTime(parentEntity.getExpireEndTime()); + } // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // } @@ -299,13 +306,19 @@ public class ForwardReportService { if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getMaterialNo())) { BomNewPbomParentVO pbomParentEntity = parentEntityMap.get(vo.getMaterialNo()); vo.setDeviseName(pbomParentEntity.getDeviseName()); + vo.setDeviseUserCode(pbomParentEntity.getDeviseUserCode()); vo.setCurrentVersion(pbomParentEntity.getCurrentVersion()); - vo.setExpireEndTime(pbomParentEntity.getReleaseTime()); + vo.setExpireEndTime(pbomParentEntity.getExpireEndTime()); + // vo.setCreatedBy(pbomParentEntity.getCreatedBy()); }else{ - vo.setExpireEndTime(parentEntity.getReleaseTime()); - vo.setDeviseName(parentEntity.getDeviseName()); - vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); + if(Objects.nonNull(parentEntity)) { + vo.setDeviseName(parentEntity.getDeviseName()); + vo.setDeviseUserCode(parentEntity.getDeviseUserCode()); + vo.setExpireEndTime(parentEntity.getExpireEndTime()); + vo.setCurrentVersion(parentEntity.getCurrentVersion()); + // vo.setCreatedBy(parentEntity.getCreatedBy()); + } // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java index 20df8c4d..f9e6de23 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java @@ -90,7 +90,8 @@ public class EBomFormalTreeTask extends RecursiveTask> detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setStatus(ebomParentEntity.getStatus()); detailVO.setBatchNo(ebomParentEntity.getBatchNo()); - detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); + // detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); + detailVO.setExpireEndTime(ebomParentEntity.getExpireEndTime()); }else { BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getRowId, detailVO.getParentRowId()).one(); @@ -102,7 +103,10 @@ public class EBomFormalTreeTask extends RecursiveTask> detailVO.setStatus(parent.getStatus()); detailVO.setEditStatus(parent.getEditStatus()); detailVO.setVirtualPackageIs(parent.getVirtualPackageIs()); - + // detailVO.setCurrentVersion() + // detailVO.setCreatedBy(parent.getCreatedBy()); + detailVO.setCurrentVersion(parent.getCurrentVersion()); + detailVO.setExpireEndTime(parent.getExpireEndTime()); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index 0890d399..19158305 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -209,15 +209,16 @@ public class EBomForwardReport extends BaseForwardReport { if (Objects.nonNull(parentEntityMap) && parentEntityMap.containsKey(vo.getBomRowId())) { // vo.setCreatedTime(forwardReportVO.getCreatedTime()); - // vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); + BomNewEbomParentVO ebomParentEntity = parentEntityMap.get(vo.getBomRowId()); vo.setLevelNum(levelNum); vo.setOrderNumber(orderNum.getAndIncrement() + ""); vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); + // vo.setCreatedBy(ebomParentEntity.getCreatedBy()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); - + vo.setExpireEndTime(ebomParentEntity.getExpireEndTime()); } else { vo.setLevelNum(levelNum); vo.setOrderNumber(orderNum.getAndIncrement() + ""); @@ -225,6 +226,9 @@ public class EBomForwardReport extends BaseForwardReport { BomNewEbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId()); vo.setDeviseName(parentVO.getDeviseName()); vo.setDeviseUserCode(parentVO.getDeviseUserCode()); + // vo.setCreatedBy(parentVO.getCreatedBy()); + vo.setCurrentVersion(parentVO.getCurrentVersion()); + vo.setExpireEndTime(parentVO.getExpireEndTime()); } // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { @@ -481,7 +485,7 @@ public class EBomForwardReport extends BaseForwardReport { nodeList) { vo.setBomVersion(parentFormal.getCurrentVersion()); // vo.setDeviseName(parentFormal.getDeviseName()); - vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); + // vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); } nodesList.addAll(nodeList); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java index a58be260..be97c3aa 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java @@ -110,7 +110,9 @@ public class PBomFormalTreeTask extends RecursiveTask> detailVO.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); detailVO.setCreatedTime(ebomParentEntity.getCreatedTime()); - detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); + + detailVO.setExpireEndTime(ebomParentEntity.getExpireEndTime()); + // detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); detailVO.setDeptName(ebomParentEntity.getDeptName()); detailVO.setDeptRowId(ebomParentEntity.getDeptRowId()); @@ -125,11 +127,14 @@ public class PBomFormalTreeTask extends RecursiveTask> if(Objects.nonNull(parent)) { detailVO.setDeviseUserCode(parent.getDeviseUserCode()); detailVO.setDeviseName(parent.getDeviseName()); + // detailVO.setCreatedBy(parent.getCreatedBy()); detailVO.setDeptName(parent.getDeptName()); detailVO.setDeptRowId(parent.getDeptRowId()); detailVO.setStatus(parent.getStatus()); detailVO.setEditStatus(parent.getEditStatus()); detailVO.setVirtualPackageIs(parent.getVirtualPackageIs()); + detailVO.setExpireEndTime(parent.getExpireEndTime()); + detailVO.setCurrentVersion(parent.getCurrentVersion()); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index 3126e17e..89f8ed0b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -412,7 +412,9 @@ public class PBomForwardReport extends BaseForwardReport { vo.setOrderNumber(orderNum.getAndIncrement() + ""); vo.setDeviseName(ebomParentEntity.getDeviseName()); vo.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); + // vo.setCreatedBy(ebomParentEntity.getCreatedBy()); vo.setCurrentVersion(ebomParentEntity.getCurrentVersion()); + vo.setExpireEndTime(ebomParentEntity.getExpireEndTime()); } else { vo.setLevelNum(levelNum); @@ -422,7 +424,9 @@ public class PBomForwardReport extends BaseForwardReport { BomNewPbomParentVO parentVO = noBomParentEntityMap.get(vo.getParentRowId()); vo.setDeviseName(parentVO.getDeviseName()); vo.setDeviseUserCode(parentVO.getDeviseUserCode()); - + // vo.setCreatedBy(parentVO.getCreatedBy()); + vo.setCurrentVersion(parentVO.getCurrentVersion()); + vo.setExpireEndTime(parentVO.getExpireEndTime()); }