Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java

@@ -326,7 +326,7 @@ public class EbomApi extends BaseApi {
 
     @PostMapping("temporary")
     @ApiOperation("暂存")
-    public ResultVO<Boolean> temporary(@RequestBody BomNewEBomParentEditDTO dto)  {
+    public ResultVO<Boolean> temporary(@RequestBody BomNewEBomParentEditDTO dto) throws ExecutionException, InterruptedException {
         return ResultVO.success(bomNewEbomParentService.temporary(dto));
     }
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/MBomApi.java

@@ -30,7 +30,6 @@ import java.util.Objects;
 /**
  * t_bom_new_mbom_parent 表控制层
  *
- *
  * @author makejava
  * @since 2024-01-01 10:53:24
  */
@@ -80,8 +79,6 @@ public class MBomApi extends BaseApi {
     }
 
 
-
-
     @GetMapping("factoryList")
     @ApiOperation("工厂列表")
     public ResultVO<List> factoryList() {
@@ -92,7 +89,6 @@ public class MBomApi extends BaseApi {
     }
 
 
-
     @PostMapping("superSaterialList")
     @ApiOperation("设置超级物料列表")
     public ResultVO<List<BomNewMbomDetailVO>> superSaterialList(@RequestParam(value = "rowId") Long rowId) {
@@ -104,14 +100,6 @@ public class MBomApi extends BaseApi {
     }
 
 
-
-
-
-
-
-
-
-
     @PostMapping("superSaterialStatus")
     @ApiOperation("设置超级物料")
     public ResultVO<Boolean> superSaterialStatus(@ApiParam("超级物料 0-否  1-是") @RequestParam(value = "status") Integer status, @RequestParam(value = "rowId") Long rowId) {

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java

@@ -39,6 +39,10 @@ public interface MaterialMainMapper extends BaseMapper<MaterialMainEntity> {
 
     Integer getUserMultiplantFacRoleCount(@Param("userRowId") Long userRowId);
 
+    List<BaseMaterialVO> getMaterialLikeByDrawingNo(@Param("drawingNo")  String   drawingNo);
+
+
+
 
 
 }

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

@@ -472,7 +472,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         List<BomNewEbomParentVO> child = allBomDetail.stream().filter(u -> u.getRowId() > 0).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(parents)) {
             List<BomNewEbomChildEntity> childList = new ArrayList<>();
-            parents.forEach(k -> {
+            child.forEach(k -> {
                 BomNewEbomChildEntity pEnt = new BomNewEbomChildEntity();
                 pEnt.setRowId(k.getRowId());
                 pEnt.setExceptionStatus(k.getExceptionStatus());
@@ -1191,7 +1191,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * 用户临时处理数据，数据的处理状态为“待处理”，当用户单击暂存的时候，所有的数据都不需要校验，直接保存即可。
      */
 
-    public Boolean temporary(BomNewEBomParentEditDTO dto) {
+    public Boolean temporary(BomNewEBomParentEditDTO dto) throws ExecutionException, InterruptedException {
 
         EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
         dto.setOpType(EbomEditStatusEnum.HANDLER_CREATED.getValue());
@@ -1210,6 +1210,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 deleteBomChild(dto.getDelDatas());
             }
         }
+
+        checkAndSaveEBomException(dto.getParent().getBomRowId());
+
+
         ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
 
 
@@ -1268,7 +1272,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 deleteBomChild(dto.getDelDatas());
             }
         }
-
+        checkAndSaveEBomException(dto.getParent().getBomRowId());
       //  ebomChildService.getBaseMapper().updateEBomMaterialUse();
         ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
         return true;

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

@@ -178,9 +178,19 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
             }
         }
 
+    }
+
+
+
+
+    public List<BaseMaterialVO> getMaterialLikeByDrawingNo( String  drawingNo ) {
+
+            List<BaseMaterialVO> materialList = SpringUtil.getBean(MaterialMainMapper.class).getMaterialLikeByDrawingNo(drawingNo);
+            return materialList;
 
     }
 
+
     /**
      * @param drawingNos 图号 或 物料号
      * @return

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

@@ -81,7 +81,11 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
             optionList.add(entity);
         } else {
             //先统一后分割
-            String[] array = nos.replace("；", ";").split(";");
+            String[] array = nos.replace("；", ";")
+                    .replace(" ",";")
+                    .replace("，",";")
+                    .replace(",",";")
+                    .split(";");
             List<String> listNo = Arrays.stream(array).collect(Collectors.toList());
             List<BaseMaterialVO> materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForAnyNo(listNo);
             if (CollectionUtil.isEmpty(materialListVo)) {

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

@@ -21,10 +21,12 @@ import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDTO;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
+import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.service.MaterialMainService;
 import com.nflg.product.bomnew.service.OptionalEbomImportChildService;
 import com.nflg.product.bomnew.service.OptionalEbomImportService;
 import com.nflg.product.bomnew.service.OptionalEbomMainService;
+import lombok.extern.slf4j.Slf4j;
 import nflg.product.common.constant.STATE;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -40,6 +42,7 @@ import java.util.stream.Collectors;
  * 导入移动破
  */
 @Service
+@Slf4j
 public class OptionalExcelService {
 
     @Resource
@@ -294,11 +297,27 @@ public class OptionalExcelService {
                 for (OptionalEbomImportDTO item1 :
                         listParent) {
                     List<OptionalEbomImportChildDTO> listChild = item1.getChild();
+
+                    //
                     SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNoImmul(listChild, OptionalEbomImportChildDTO::getDrawingNo, OptionalEbomImportChildDTO::setMaterialNo, OptionalEbomImportChildDTO::setMaterialDesc);
 
-                    //构建测试数据 无物料号 用图号代替
                     for (OptionalEbomImportChildDTO childDTO : listChild) {
                         if (!childDTO.getTag() && StringUtils.isEmpty(childDTO.getMaterialNo())) {
+                            //in 批量没匹配到 再模糊匹配一次
+                             List<BaseMaterialVO>  likeList=    SpringUtil.getBean(MaterialMainService.class)
+                                     .getMaterialLikeByDrawingNo(StrUtil.format("{} {}",childDTO.getDrawingNo(),childDTO.getMaterialName()));
+                             if(CollectionUtil.isNotEmpty(likeList) ) {
+                                 if (likeList.size() == 1) {
+                                     BaseMaterialVO materialVO = likeList.get(0);
+                                     childDTO.setMaterialNo(materialVO.getMaterialNo());
+                                     childDTO.setMaterialDesc(materialVO.getMaterialDesc());
+                                     continue;
+                                 } else if (likeList.size() > 1) {
+                                     throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("第{}行，{} 图号匹配到多条物料数据", childDTO.getLineNo(), childDTO.getDrawingNo()));
+                                 }
+
+                             }
+
                             // childDTO.setMaterialNo(childDTO.getDrawingNo());
                             childDTO.setError(childDTO.getError() | OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getValue());
                             item1.setError(true);
@@ -308,7 +327,7 @@ public class OptionalExcelService {
 
                 }
             });
-            System.out.println(JSON.toJSON(optionalEbomInportExcelDTO));
+
 
         }
 
@@ -318,6 +337,7 @@ public class OptionalExcelService {
             throw new NflgBusinessException(STATE.Error, hintMsg);
         }
 
+       System.out.println(JSON.toJSONString(optionalEbomInportExcelDTO));
      // return  true;
         //保存db
     return batchExcelToRepertory(optionalEbomInportExcelDTO);

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java

@@ -9,6 +9,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.nflg.product.base.core.exception.NflgBusinessException;
+import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum;
 import com.nflg.product.bomnew.constant.MaterialGetEnum;
 import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum;
@@ -80,7 +81,7 @@ public class CheckEBomException {
      */
     public void initException() {
         //初始化物料信息
-        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail,"projectType");
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
 
         checkException();
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/IndexListTree.java

@@ -23,9 +23,7 @@ public class IndexListTree {
 
         Map<Long, List<BomNewMbomMiddleVO>> groupMap = childs.stream().collect(Collectors.groupingBy(BomNewMbomMiddleVO::getParentRowId));
         childs.forEach(child -> {
-
             child.setChildNodes(groupMap.get(child.getRowId()));
-
             sysnParentParam(parent,child);
         });
 

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml

@@ -108,6 +108,15 @@
 
     </select>
 
+    <select id="getMaterialLikeByDrawingNo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
+        select material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,material_category_code ,material_get_type
+        from t_material_main
+        where drawing_no  like concat('', #{drawingNo},'%')
+
+
+    </select>
+
+