Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak

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

@@ -247,13 +247,15 @@ public class DQBomImportService {
                 .map(d -> OperationErrorMsgVO.create("第" + d.getRowNum() + "行", "编号和图号都为空"))
                 .collect(Collectors.toList()));
 
+        List<BaseMaterialVO> materialBaseInfos;
         //如果编号不为空，则图号使用主物料图号
         List<String> materialNos = datas.stream()
                 .map(DQbomExcelVO::getMaterialNo)
                 .filter(StrUtil::isNotBlank)
                 .distinct()
                 .collect(Collectors.toList());
-        List<BaseMaterialVO> materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos);
+        if (CollUtil.isNotEmpty(materialNos)) {
+            materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos);
             for (DQbomExcelVO d : datas) {
                 BaseMaterialVO vo = materialBaseInfos.stream()
                         .filter(m -> m.getMaterialNo().equals(d.getMaterialNo()))
@@ -263,6 +265,7 @@ public class DQBomImportService {
                     d.setDrawingNo(vo.getDrawingNo());
                 }
             }
+        }
 
         //如果编号为空，图号不为空，则编号使用主物料编号
         List<String> drawingNos = datas.stream()
@@ -270,6 +273,7 @@ public class DQBomImportService {
                 .map(DQbomExcelVO::getDrawingNo)
                 .distinct()
                 .collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(drawingNos)) {
             materialBaseInfos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(drawingNos);
             for (DQbomExcelVO d : datas) {
                 if (StrUtil.isNotBlank(d.getDrawingNo()) && StrUtil.isBlank(d.getMaterialNo())) {
@@ -284,6 +288,7 @@ public class DQBomImportService {
                     }
                 }
             }
+        }
         return errorMsg;
     }
 

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

@@ -593,13 +593,6 @@ public class DQBomService {
         wrapper.eq(BomNewDQbomParentEntity::getMaterialNo, parent.getMaterialNo());
         wrapper.ne(BomNewDQbomParentEntity::getRowId, parent.getRowId());
         dQBomParentService.getBaseMapper().delete(wrapper);
-        List<BomNewDQbomChildEntity> cc = dQBomChildService.getByParentRowId(parent.getRowId());
-        cc.forEach(c -> {
-            c.setStatus(2);
-            c.setEditStatus(2);
-            c.setModifyTime(LocalDateTime.now());
-        });
-        children.addAll(cc);
 
         BomNewPbomParentEntity pp = bomNewPbomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo())
                 .orderByDesc(BomNewPbomParentEntity::getRowId)
@@ -611,20 +604,9 @@ public class DQBomService {
                         , parent.getCurrentVersion(), pp.getCurrentVersion()));
             } else {
                 if (pp.getStatus() >= 4) {
-                    //                    List<BomNewDQbomVO> dqChildren = getChild(parent.getRowId());
-                    //                    Set<String> pChildren = bomNewPbomChildService.lambdaQuery()
-                    //                            .select(BomNewPbomChildEntity::getMaterialNo)
-                    //                            .eq(BomNewPbomChildEntity::getParentRowId, pp.getRowId())
-                    //                            .list()
-                    //                            .stream()
-                    //                            .map(BomNewPbomChildEntity::getMaterialNo)
-                    //                            .collect(Collectors.toSet());
-                    //                    if (dqChildren.size() != pChildren.size()
-                    //                            || !Sets.difference(dqChildren.stream().map(BomNewDQbomVO::getMaterialNo).collect(Collectors.toSet()), pChildren).isEmpty()) {
                     parent.setCurrentVersion(VersionUtil.getNextVersion(pp.getCurrentVersion()));
                     pp.setLastVersionIs(0);
                     bomNewPbomParentService.updateById(pp);
-                    //                    }
                 } else {
                     parent.setCurrentVersion(pp.getCurrentVersion());
                     bomNewPbomParentService.getBaseMapper().deleteById(pp.getRowId());
@@ -636,12 +618,21 @@ public class DQBomService {
             parent.setCurrentVersion(VersionUtil.getNextVersion(""));
         }
         //处理子级
+        List<BomNewDQbomChildEntity> cc = dQBomChildService.getByParentRowId(parent.getRowId());
+        if (CollUtil.isNotEmpty(cc)) {
+            cc.forEach(c -> {
+                c.setStatus(2);
+                c.setEditStatus(2);
+                c.setModifyTime(LocalDateTime.now());
+            });
+            children.addAll(cc);
             dQBomParentService.lambdaQuery()
                     .in(BomNewDQbomParentEntity::getMaterialNo, cc.stream().map(BomNewDQbomChildEntity::getMaterialNo).collect(Collectors.toList()))
                     .eq(BomNewDQbomParentEntity::getStatus, 1)
                     .list()
                     .forEach(p -> buildTree(p, parents, children));
         }
+    }
 
     private int versionCompare(String version1, String version2) {
         if (StrUtil.isBlank(version1)) return 1;