fix: 增强BOM导入功能，添加工序ID绑定及错误提示

yuan

20 小时以前 b179a58f92528a0c0fe9bc8c657c19bc493812d8

 src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java

@@ -15,8 +15,7 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.BomImportDto;
import com.ruoyi.production.bean.dto.ProductStructureDto;
import com.ruoyi.technology.bean.dto.BomImportDto;
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.dto.TechnologyBomStructureDto;
import com.ruoyi.technology.bean.vo.TechnologyBomStructureVo;
@@ -26,9 +25,11 @@
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyBom;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
import com.ruoyi.technology.pojo.TechnologyOperation;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyBomService;
import com.ruoyi.technology.service.TechnologyBomStructureService;
import com.ruoyi.technology.service.TechnologyOperationService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -50,6 +51,7 @@
    private final TechnologyRoutingMapper technologyRoutingMapper;
    private final IProductService productService;
    private final TechnologyBomStructureMapper technologyBomStructureMapper;
    private final TechnologyOperationService technologyOperationService;

    /**
     * 分页查询BOM列表。
@@ -193,31 +195,42 @@
            dto.setParentSpec(clean(dto.getParentSpec()));
            dto.setChildName(clean(dto.getChildName()));
            dto.setChildSpec(clean(dto.getChildSpec()));
            dto.setProcess(clean(dto.getProcess()));
        });
        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());
        TechnologyBom bom = new TechnologyBom();
        bom.setProductModelId(rootModel.getId());
        bom.setVersion("1.0");
        technologyBomMapper.insert(bom);
        bom.setBomNo("BM." + String.format("%05d", bom.getId()));
        technologyBomMapper.updateById(bom);
        //  工序名称 -> 工序ID(technology_operation 表),导入时绑定到 BOM 结构节点
        Map<String, Long> processMap = technologyOperationService.list().stream()
                .collect(Collectors.toMap(TechnologyOperation::getName, TechnologyOperation::getId, (k1, k2) -> k1));

        // 记录已经插入结构的节点：Key = "名称+规格", Value = structure_id
        // 每遇到一个根节点行会重置,支持一次导入多个 BOM
        Map<String, Long> treePathMap = new HashMap<>();
        // 当前正在处理的 BOM,遇到根节点行时重新创建
        TechnologyBom bom = null;

        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())) {
            //  根节点行: 工序、子项名称、子项规格全为空,属于一个新的 BOM 的父节点
            if (StringUtils.isBlank(dto.getProcess())
                    && StringUtils.isBlank(dto.getChildName())
                    && StringUtils.isBlank(dto.getChildSpec())) {
                if (StringUtils.isBlank(dto.getParentName())) {
                    throw new ServiceException("导入失败: 第" + (i + 1) + "行父项名称为空");
                }

                //  创建新的 BOM
                ProductModel rootModel = findModel(dto.getParentName(), dto.getParentSpec());
                bom = new TechnologyBom();
                bom.setProductModelId(rootModel.getId());
                bom.setVersion("1.0");
                technologyBomMapper.insert(bom);
                bom.setBomNo("BM." + String.format("%05d", bom.getId()));
                technologyBomMapper.updateById(bom);

                //  插入根结构节点,重置节点 Map,开始记录这个 BOM 的树
                TechnologyBomStructure rootNode = new TechnologyBomStructure();
                rootNode.setBomId(bom.getId().longValue());
                rootNode.setParentId(null); // 顶层没有父节点
@@ -226,11 +239,15 @@
                rootNode.setUnit(rootModel.getUnit());
                technologyBomStructureService.save(rootNode);

                treePathMap = new HashMap<>();
                treePathMap.put(parentKey, rootNode.getId());
                continue;
            }

            //  处理子层级节点
            if (bom == null) {
                throw new ServiceException("导入失败: 首行必须是BOM父节点(父项信息行),子项前需先定义父项");
            }
            //  找到父节点在数据库里的 ID
            Long parentStructureId = treePathMap.get(parentKey);
            if (parentStructureId == null) {
@@ -248,9 +265,14 @@
            node.setProductModelId(childModel.getId());
            node.setUnitQuantity(dto.getUnitQty());
            node.setUnit(childModel.getUnit());
//            if (processMap.containsKey(dto.getProcess())) {
//                node.setProcessId(processMap.get(dto.getProcess()));
//            }
            //  绑定投料工序(technology_operation),工序不存在时给出明确提示
            if (StringUtils.isNotBlank(dto.getProcess())) {
                Long operationId = processMap.get(dto.getProcess());
                if (operationId == null) {
                    throw new ServiceException("导入失败: 工序[" + dto.getProcess() + "]不存在,请先维护工序");
                }
                node.setOperationId(operationId);
            }
            technologyBomStructureService.save(node);

            //  把当前子项记录到 Map,作为以后更深层级的父项查找依据
@@ -258,75 +280,82 @@
            treePathMap.put(childKey, node.getId());
        }

        //  整个文件没有任何根节点行
        if (bom == null) {
            return R.fail("导入失败: 未找到BOM父节点行");
        }

        return R.ok("BOM导入成功");
    }


    @Override
    public void exportBom(HttpServletResponse response, Integer bomId) {
    public void exportBom(HttpServletResponse response, Long bomId) {
        if (bomId == null) {
            throw new ServiceException("BOM ID不能为空");
        }

        List<TechnologyBomStructureVo> treeData = technologyBomStructureService.listByBomId(bomId);
        if (treeData == null || treeData.isEmpty()) {
            return;
        }

//        List<ProductStructureDto> treeData = productStructureService.listBybomId(bomId);
//        if (treeData == null || treeData.isEmpty()) {
//            return;
//        }
//
//        //  将树形结构扁平化 使用 BFS算法 导出,按层级顺序
//        List<BomImportDto> exportList = new ArrayList<>();
//
//        // Map<ID, Node> idMap 用于查找父节点
//        Map<Long, ProductStructureDto> idMap = new HashMap<>();
//        populateMap(treeData, idMap);
//
//        //  treeData 的第一个是根节点
//        for (ProductStructureDto root : treeData) {
//            //  添加根节点
//            BomImportDto rootRow = new BomImportDto();
//            rootRow.setParentName(root.getProductName());
//            rootRow.setParentSpec(root.getModel());
//            rootRow.setUnitQty(root.getUnitQuantity());
//            rootRow.setRemark("");
//            exportList.add(rootRow);
//
//            //  BFS 遍历-队列
//            Queue<ProductStructureDto> queue = new LinkedList<>();
//            if (root.getChildren() != null) {
//                queue.addAll(root.getChildren());
//            }
//
//            while (!queue.isEmpty()) {
//                ProductStructureDto child = queue.poll();
//
//                // 查找父节点
//                ProductStructureDto parent = idMap.get(child.getParentId());
//                if (parent == null) {
//                    // 除了最外层节点,其他节点的父类肯定是不会为空的
//                    continue;
//                }
//
//                BomImportDto row = new BomImportDto();
//                // 父类信息
//                row.setParentName(parent.getProductName());
//                row.setParentSpec(parent.getModel());
//                // 子类信息
//                row.setChildName(child.getProductName());
//                row.setChildSpec(child.getModel());
//                row.setUnitQty(child.getUnitQuantity());
//                row.setProcess(child.getProcessName());
//
//                exportList.add(row);
//
//                //  将子节点的子节点加入队列-下一层
//                if (child.getChildren() != null && !child.getChildren().isEmpty()) {
//                    queue.addAll(child.getChildren());
//                }
//            }
//        }
        //  将树形结构扁平化 使用 BFS算法 导出,按层级顺序
        List<BomImportDto> exportList = new ArrayList<>();

        // Map<ID, Node> idMap 用于查找父节点
        Map<Long, TechnologyBomStructureVo> idMap = new HashMap<>();
        populateMap(treeData, idMap);

        //  treeData 的第一个是根节点
        for (TechnologyBomStructureVo root : treeData) {
            //  添加根节点
            BomImportDto rootRow = new BomImportDto();
            rootRow.setParentName(root.getProductName());
            rootRow.setParentSpec(root.getModel());
            rootRow.setUnitQty(root.getUnitQuantity());
            rootRow.setParentCode(root.getProductCode());
            rootRow.setRemark("");
            exportList.add(rootRow);

            //  BFS 遍历-队列
            Queue<TechnologyBomStructureVo> queue = new LinkedList<>();
            if (root.getChildren() != null) {
                queue.addAll(root.getChildren());
            }

            while (!queue.isEmpty()) {
                TechnologyBomStructureVo child = queue.poll();

                // 查找父节点
                TechnologyBomStructureVo parent = idMap.get(child.getParentId());
                if (parent == null) {
                    // 除了最外层节点,其他节点的父类肯定是不会为空的
                    continue;
                }

                BomImportDto row = new BomImportDto();
                // 父类信息
                row.setParentName(parent.getProductName());
                row.setParentSpec(parent.getModel());
                // 子类信息
                row.setChildName(child.getProductName());
                row.setChildSpec(child.getModel());
                row.setUnitQty(child.getUnitQuantity());
                row.setProcess(child.getOperationName());
                row.setChildCode(child.getProductCode());

                exportList.add(row);

                //  将子节点的子节点加入队列-下一层
                if (child.getChildren() != null && !child.getChildren().isEmpty()) {
                    queue.addAll(child.getChildren());
                }
            }
        }

        ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
//        util.exportExcel(response, exportList, "BOM结构导出");
        util.exportExcel(response, exportList, "BOM结构导出");
    }

    @Override
@@ -408,11 +437,11 @@
        return s.replaceAll("[\\u00A0\\u3000]", "").trim();
    }

    private void populateMap(List<ProductStructureDto> nodes, Map<Long, ProductStructureDto> map) {
    private void populateMap(List<TechnologyBomStructureVo> nodes, Map<Long, TechnologyBomStructureVo> map) {
        if (nodes == null || nodes.isEmpty()) {
            return;
        }
        for (ProductStructureDto node : nodes) {
        for (TechnologyBomStructureVo node : nodes) {
            map.put(node.getId(), node);
            populateMap(node.getChildren(), map);
        }