1-pbom-优化

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);
     }

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<BomNewEbomParentEntit
     List<ReverseReportVO> eBomReverseReportNewst(@Param("materialNo")String materialNo);
     Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo);
 
+    @Deprecated
     void  updateRootForWaitReview();
 
+    void  updateRootForWaitReview1();
+    void  updateRootForWaitReview2();
+
     void resetBomExist(Long rowId);
 
     Set<String> getMaterialParent(@Param("materialNos") Collection<String> materialNos ,@Param("createdBy") String createdBy);
@@ -121,7 +125,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
     Integer getSapErrorNum(String userCode);
 
     List<BomNewEbomParentEntity> getLatestByMaterialNo(Collection<String> materialNos);
-
+    @Deprecated
     void updateLastVersionIs();
 
     List<BomNewPbomParentVO> getReverseBoms(Long parentRowId);

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<BomNewEbomParentMapper,
      * @param materialNo
      * @return
      */
+    @Deprecated
     public Set<String> getParentMaterialByMaterialNo(String materialNo, Boolean selfIs) {
         BomNewEbomMaterialUseEntity materialBom = bomNewEbomMaterialUseService.lambdaQuery().eq(BomNewEbomMaterialUseEntity::getMaterialNo, materialNo).one();
         Set<String> result = new HashSet<>();
@@ -295,6 +296,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * @param materialNos
      * @return
      */
+    @Deprecated
     public List<String> getBatchParentMaterialByMaterialNo(List<String> materialNos) {
         List<BomNewEbomMaterialUseEntity> materialBom = bomNewEbomMaterialUseService.lambdaQuery().in(BomNewEbomMaterialUseEntity::getMaterialNo, materialNos).list();
         List<String> result = new ArrayList<>();
@@ -2143,7 +2145,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //        ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
 
         if (eBomEdit.isRootForWaitReview()) {
-            this.getBaseMapper().updateRootForWaitReview();
+            updateRootForWaitReview();
         }
 
 
@@ -2153,6 +2155,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         return retParentVO;
     }
 
+    public void updateRootForWaitReview(){
+        this.getBaseMapper().updateRootForWaitReview1();
+        this.getBaseMapper().updateRootForWaitReview2();
+    }
+
     /**
      * 提交物料
      * <p>
@@ -2210,7 +2217,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         // checkAndSaveEBomException(dto.getParent().getBomRowId());
         if (eBomEdit.isRootForWaitReview()) {
-            this.getBaseMapper().updateRootForWaitReview();
+            this.updateRootForWaitReview();
         }
         resetBomExist(dto.getParent().getRowId());
         return true;

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java

@@ -517,9 +517,9 @@ public class DQBomService {
         savePbomParents(parents, root.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM : PBomStatusEnum.PUBLISH);
         savePbomChildren(children, parents);
 
-        CompletableFuture.runAsync(() -> {
+//        CompletableFuture.runAsync(() -> {
-            bomNewPbomParentService.getBaseMapper().updatePBomMaterialUse();
+//            bomNewPbomParentService.getBaseMapper().updatePBomMaterialUse();
-        });
+//        });
     }
 
     private void savePbomChildren(List<BomNewDQbomChildEntity> children, List<BomNewDQbomParentEntity> parents) {

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>
+    <update id="updateRootForWaitReview1">
+        update t_bom_new_ebom_parent
+        set root_is_for_wait_review=0
+    </update>
+    <update id="updateRootForWaitReview2">
+        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>
     <!--更新-待复核根节点-->
     <update id="updateRootForWaitReview">
         update t_bom_new_ebom_parent