Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

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

@@ -1,5 +1,6 @@
package com.ruoyi.technology.service.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,27 +12,32 @@
import com.ruoyi.basic.service.IProductService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
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.dto.BomImportDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.bean.dto.BomImportDto;
import com.ruoyi.production.bean.dto.ProductStructureDto;
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.dto.TechnologyBomStructureDto;
import com.ruoyi.technology.bean.vo.TechnologyBomStructureVo;
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyBom;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyBomService;
import com.ruoyi.technology.service.TechnologyBomStructureService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;

@Service
@@ -43,6 +49,7 @@
    private final TechnologyBomStructureService technologyBomStructureService;
    private final TechnologyRoutingMapper technologyRoutingMapper;
    private final IProductService productService;
    private final TechnologyBomStructureMapper technologyBomStructureMapper;

    /**
     * 分页查询BOM列表。
@@ -126,7 +133,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean batchDelete(List<Integer> ids) {
    public boolean batchDelete(List<Long> ids) {
        if (ids == null || ids.isEmpty()) {
            throw new ServiceException("Select at least one BOM");
        }
@@ -322,6 +329,33 @@
//        util.exportExcel(response, exportList, "BOM结构导出");
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R copy(TechnologyBom technologyBom) {
        TechnologyBom oldTechnologyBom = technologyBomMapper.selectById(technologyBom.getId());
        List<TechnologyBomStructureVo> oldTechnologyBomStructureVos = technologyBomStructureService.listByBomId(technologyBom.getId().longValue());
        //校验产品规格是否存在。
        validateProductModel(oldTechnologyBom.getProductModelId());
        TechnologyBom newTechnologyBom = new TechnologyBom();
        newTechnologyBom.setProductModelId(oldTechnologyBom.getProductModelId());
        newTechnologyBom.setVersion("FZ" + oldTechnologyBom.getVersion());
        newTechnologyBom.setRemark(oldTechnologyBom.getRemark());
        boolean saved = technologyBomMapper.insert(newTechnologyBom) > 0;
        if (!saved) {
            return R.fail("Copy BOM failed");
        }
        newTechnologyBom.setBomNo("BM." + String.format("%05d", newTechnologyBom.getId()));
        technologyBomMapper.updateById(newTechnologyBom);
        //初始化BOM根节点结构。
        initRootStructure(newTechnologyBom.getId().longValue(), newTechnologyBom.getProductModelId());
        //把产品结构里面的数据也全部都复制
        TechnologyBomStructureVo technologyBomStructureVo = oldTechnologyBomStructureVos.get(0);
        TechnologyBomStructureDto technologyBomStructureDto = convertTree(technologyBomStructureVo);
        technologyBomStructureDto.setBomId(newTechnologyBom.getId().longValue());
        technologyBomStructureService.addTechnologyBomStructure(technologyBomStructureDto);
        return R.ok();
    }

    private ProductModel findModel(String name, String spec) {
        Product product = productService.getOne(new LambdaQueryWrapper<Product>()
                .eq(Product::getProductName, name).last("limit 1"));
@@ -383,4 +417,69 @@
            populateMap(node.getChildren(), map);
        }
    }

    /**
     * 递归转换树形结构 VO -> DTO
     * 自动生成虚拟 tempId / parentTempId，保证任意层级树结构正确
     */
    public static TechnologyBomStructureDto convertTree(TechnologyBomStructureVo vo) {
        if (vo == null) {
            return null;
        }
        TechnologyBomStructureDto realDto = convertNode(vo, "0"); // 根节点父ID=0（纯数字）
        TechnologyBomStructureDto rootDto = new TechnologyBomStructureDto();
        rootDto.setTempId("0");
        rootDto.setChildren(Collections.singletonList(realDto));

        return rootDto;
    }

    /**
     * 核心递归方法
     * @param vo 原始节点
     * @param parentTempId 父节点 纯数字ID
     * @return 转换后DTO
     */
    private static TechnologyBomStructureDto convertNode(TechnologyBomStructureVo vo, String parentTempId) {
        if (vo == null) {
            return null;
        }

        TechnologyBomStructureDto dto = new TechnologyBomStructureDto();
        BeanUtils.copyProperties(vo, dto);

        String currentTempId = getNumberId();
        dto.setTempId(currentTempId);
        dto.setParentTempId(parentTempId);


        dto.setId(null);
        dto.setParentId(null);

        // ===================== 递归子节点 =====================
        List<TechnologyBomStructureVo> voChildren = vo.getChildren();
        if (CollUtil.isNotEmpty(voChildren)) {
            List<TechnologyBomStructureDto> dtoChildren = new ArrayList<>();
            for (TechnologyBomStructureVo childVo : voChildren) {
                // 子节点的父ID = 当前节点的数字ID
                dtoChildren.add(convertNode(childVo, currentTempId));
            }
            dto.setChildren(dtoChildren);
        } else {
            dto.setChildren(new ArrayList<>());
        }

        return dto;
    }

    /**
     * 生成 13位 纯数字随机ID（安全、不重复、高性能）
     */
    private static String getNumberId() {
        // 生成 1000000000000 ~ 9999999999999 之间的数字
        long min = 1000000000000L;
        long max = 9999999999999L;
        long randomNum = ThreadLocalRandom.current().nextLong(min, max + 1);
        return String.valueOf(randomNum);
    }
}