yys 1.修改bug

云

5 天以前 6d76addcf2e459d7aea53c3858847e8047746a53

 src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.pojo.Product;
@@ -97,6 +98,53 @@
        return AjaxResult.error();
    }

    /**
     * 递归保存 BOM：先保存父项 → 保存子项 → 建立关系 → 递归子项的子项
     * @param children 当前父项的子项列表
     * @return 保存后的父项产品ID
     */
    private void saveBomRecursive(List<BomImportDto> children,ProductBom bom,ProductModel rootModel,Map<String, Long> processMap) {
        // 1. 获取children中子项产品编号为空的数据
        List<BomImportDto> parentChildren = children
                .stream()
                .filter(child -> StringUtils.isEmpty(child.getChildCode()))
                .collect(Collectors.toList());
        if(CollectionUtils.isEmpty(parentChildren)){
            throw new ServiceException("请选择父项产品编号");
        }
        BomImportDto parentId = parentChildren.get(0); // 父级数据
        ProductStructure rootNode = new ProductStructure();
        rootNode.setBomId(bom.getId());
        rootNode.setParentId(null); // 顶层没有父节点
        rootNode.setProductModelId(rootModel.getId());
        rootNode.setUnitQuantity(BigDecimal.ONE);
        rootNode.setUnit(rootModel.getUnit());
        productStructureService.save(rootNode);

        // 2. 遍历子项，逐个处理
        for (BomImportDto child : children) {
            //  跳过没有子项的父项
            if(StringUtils.isEmpty(child.getChildCode())){
                continue;
            }
            //  获取子项模型信息
            ProductModel childModel = findModel(child.getChildName(), child.getChildSpec());

            //  插入结构表
            ProductStructure node = new ProductStructure();
            node.setBomId(bom.getId());
            node.setParentId(rootNode.getId()); // 父节点ID
            node.setProductModelId(childModel.getId());
            node.setUnitQuantity(child.getUnitQty());
            node.setUnit(childModel.getUnit());
            if (processMap.containsKey(child.getProcess())) {
                node.setProcessId(processMap.get(child.getProcess()));
            }
            productStructureService.save(node);
        }
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult uploadBom(MultipartFile file) {
@@ -120,67 +168,25 @@
        handleProcess(list);
        Map<String, Long> processMap = productProcessService.list().stream()
                .collect(Collectors.toMap(ProductProcess::getName, ProductProcess::getId, (k1, k2) -> k1));

        //  创建 BOM 数据
        BomImportDto first = list.get(0);
        ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
        ProductBom bom = new ProductBom();
        bom.setProductModelId(rootModel.getId());
        bom.setVersion("1.0");
        productBomMapper.insert(bom);
        bom.setBomNo("BM." + String.format("%05d", bom.getId()));
        productBomMapper.updateById(bom);

        // 记录已经插入结构的节点：Key = "名称+规格", Value = structure_id
        Map<String, Long> treePathMap = new HashMap<>();

        for (int i = 0; i < list.size(); i++) {
            BomImportDto dto = list.get(i);
            String parentKey = dto.getParentName() + "|" + dto.getParentSpec();
            String childKey = dto.getChildName() + "|" + dto.getChildSpec();

            //处理根节点,第一行且子项为空
            if (i == 0 && StringUtils.isBlank(dto.getChildName())) {
                ProductStructure rootNode = new ProductStructure();
                rootNode.setBomId(bom.getId());
                rootNode.setParentId(null); // 顶层没有父节点
                rootNode.setProductModelId(rootModel.getId());
                rootNode.setUnitQuantity(BigDecimal.ONE);
                rootNode.setUnit(rootModel.getUnit());
                productStructureService.save(rootNode);

                treePathMap.put(parentKey, rootNode.getId());
                continue;
            }

            //  处理子层级节点
            //  找到父节点在数据库里的 ID
            Long parentStructureId = treePathMap.get(parentKey);
            if (parentStructureId == null) {
                // 如果 Map 里找不到，说明 Excel 顺序乱了或者数据有误
                throw new ServiceException("导入失败: 父项[" + dto.getParentName() + "]必须在其子项之前定义");
            }

            //  获取子项模型信息
            ProductModel childModel = findModel(dto.getChildName(), dto.getChildSpec());

            //  插入结构表
            ProductStructure node = new ProductStructure();
            node.setBomId(bom.getId());
            node.setParentId(parentStructureId); // 父节点ID
            node.setProductModelId(childModel.getId());
            node.setUnitQuantity(dto.getUnitQty());
            node.setUnit(childModel.getUnit());
            if (processMap.containsKey(dto.getProcess())) {
                node.setProcessId(processMap.get(dto.getProcess()));
            }
            productStructureService.save(node);

            //  把当前子项记录到 Map,作为以后更深层级的父项查找依据
            //  同一父项下的同名子项不需要重复记录
            treePathMap.put(childKey, node.getId());
        // 1. 按父项编码分组
        Map<String, List<BomImportDto>> parentMap = list.stream()
                .filter(bom -> StringUtils.isNotBlank(bom.getParentCode()))
                .collect(Collectors.groupingBy(BomImportDto::getParentCode));
        // 2. 遍历所有父项，递归保存
        for (Map.Entry<String, List<BomImportDto>> entry : parentMap.entrySet()) {
            //  创建 BOM 数据
            BomImportDto first = entry.getValue().get(0);
            ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
            ProductBom bom = new ProductBom();
            bom.setProductModelId(rootModel.getId());
            bom.setVersion("1.0");
            productBomMapper.insert(bom);
            bom.setBomNo("BM." + String.format("%05d", bom.getId()));
            productBomMapper.updateById(bom);
            // 处理bom子表数据
            List<BomImportDto> children = entry.getValue();
            saveBomRecursive(children,bom,rootModel,processMap);
        }

        return AjaxResult.success("BOM导入成功");
    }