From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
index 4eba028..2a4cd1d 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/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,13 +12,17 @@
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.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;
@@ -32,6 +37,7 @@
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鍒楄〃銆�
@@ -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);
+ //鍒濆鍖朆OM鏍硅妭鐐圭粨鏋勩��
+ 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 鐖惰妭鐐� 绾暟瀛桰D
+ * @return 杞崲鍚嶥TO
+ */
+ 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) {
+ // 瀛愯妭鐐圭殑鐖禝D = 褰撳墠鑺傜偣鐨勬暟瀛桰D
+ dtoChildren.add(convertNode(childVo, currentTempId));
+ }
+ dto.setChildren(dtoChildren);
+ } else {
+ dto.setChildren(new ArrayList<>());
+ }
+
+ return dto;
+ }
+
+ /**
+ * 鐢熸垚 13浣� 绾暟瀛楅殢鏈篒D锛堝畨鍏ㄣ�佷笉閲嶅銆侀珮鎬ц兘锛�
+ */
+ private static String getNumberId() {
+ // 鐢熸垚 1000000000000 ~ 9999999999999 涔嬮棿鐨勬暟瀛�
+ long min = 1000000000000L;
+ long max = 9999999999999L;
+ long randomNum = ThreadLocalRandom.current().nextLong(min, max + 1);
+ return String.valueOf(randomNum);
+ }
}
--
Gitblit v1.9.3