diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index 43a54c8b..c848823c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -33,10 +33,12 @@ public class CheckEBomException {
public CheckEBomException(Long bomRowId) throws ExecutionException, InterruptedException {
allBomDetail = SpringUtil.getBean(BomNewEbomParentService.class).getBomTree(bomRowId);
BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).getById(bomRowId);
- BomNewEbomParentVO convert = Convert.convert(BomNewEbomParentVO.class, parent);
- convert.setBomRowId(convert.getRowId());
- convert.setParentRowId(0L);
- allBomDetail.add(convert);
+ if(Objects.nonNull(parent)) {
+ BomNewEbomParentVO convert = Convert.convert(BomNewEbomParentVO.class, parent);
+ convert.setBomRowId(convert.getRowId());
+ convert.setParentRowId(0L);
+ allBomDetail.add(convert);
+ }
}
/**
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index e4afcf2b..15f0d36b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -48,7 +48,7 @@
and status=2
- and created_time> DATE_ADD(now(), INTERVAL -3 DAY)
+ and convert_to_ebom_time> DATE_ADD(now(), INTERVAL -3 DAY)
@@ -111,7 +111,7 @@
- update t_bom_new_original_parent set status = #{status} where
+ update t_bom_new_original_parent set status = #{status},convert_to_ebom_time=now() where
row_id in
#{rowId}