diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index c398d113..383b02aa 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -173,7 +173,7 @@ public class OriginalBomApi extends BaseApi { //跟新EBom 根节点 // ebomParentService.getBaseMapper().updateRootState(); ebomParentService.updateRootState(); - ebomParentService.getBaseMapper().updateRootForWaitReview(); + ebomParentService.updateRootForWaitReview(); return ResultVO.success(result); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 757cb8d2..663e9441 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -79,8 +79,12 @@ public interface BomNewEbomParentMapper extends BaseMapper eBomReverseReportNewst(@Param("materialNo")String materialNo); Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo); + @Deprecated void updateRootForWaitReview(); + void updateRootForWaitReview1(); + void updateRootForWaitReview2(); + void resetBomExist(Long rowId); Set getMaterialParent(@Param("materialNos") Collection materialNos ,@Param("createdBy") String createdBy); @@ -121,7 +125,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getLatestByMaterialNo(Collection materialNos); - + @Deprecated void updateLastVersionIs(); List getReverseBoms(Long parentRowId); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 990b492a..060cce06 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -233,6 +233,7 @@ public class BomNewEbomParentService extends ServiceImpl getParentMaterialByMaterialNo(String materialNo, Boolean selfIs) { BomNewEbomMaterialUseEntity materialBom = bomNewEbomMaterialUseService.lambdaQuery().eq(BomNewEbomMaterialUseEntity::getMaterialNo, materialNo).one(); Set result = new HashSet<>(); @@ -295,6 +296,7 @@ public class BomNewEbomParentService extends ServiceImpl getBatchParentMaterialByMaterialNo(List materialNos) { List materialBom = bomNewEbomMaterialUseService.lambdaQuery().in(BomNewEbomMaterialUseEntity::getMaterialNo, materialNos).list(); List result = new ArrayList<>(); @@ -2143,7 +2145,7 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); if (eBomEdit.isRootForWaitReview()) { - this.getBaseMapper().updateRootForWaitReview(); + updateRootForWaitReview(); } @@ -2153,6 +2155,11 @@ public class BomNewEbomParentService extends ServiceImpl @@ -2210,7 +2217,7 @@ public class BomNewEbomParentService extends ServiceImpl { - bomNewPbomParentService.getBaseMapper().updatePBomMaterialUse(); - }); +// CompletableFuture.runAsync(() -> { +// bomNewPbomParentService.getBaseMapper().updatePBomMaterialUse(); +// }); } private void savePbomChildren(List children, List parents) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 6ccd5ee3..912374db 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -317,6 +317,18 @@ and a.last_version_is = 1 AND a.virtual_package_is = 0; + + update t_bom_new_ebom_parent + set root_is_for_wait_review=0 + + + update t_bom_new_ebom_parent a left join ( + select b.row_id, b.material_no,a.`status` from t_bom_new_ebom_parent a join t_bom_new_ebom_child b on a.row_id=b.parent_row_id and a.`status` in (1,3) and last_version_is=1 + ) b + on a.material_no=b.material_no + set a.root_is_for_wait_review=1 + where a.`status` in (1, 3) and last_version_is=1 and b.row_id is null + update t_bom_new_ebom_parent