From cb8ee71facb5520be75dcc9b77e245edc752650e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 13 五月 2026 15:00:12 +0800
Subject: [PATCH] fix:1.生产订单按照bom结构的单位需求数量更改 2.修改生产订单修改对应报工的数量
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 240 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 170 insertions(+), 70 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 09d85df..8894288 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,27 +12,31 @@
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.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;
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 jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
@Service
@@ -43,6 +48,7 @@
private final TechnologyBomStructureService technologyBomStructureService;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final IProductService productService;
+ private final TechnologyBomStructureMapper technologyBomStructureMapper;
/**
* 鍒嗛〉鏌ヨBOM鍒楄〃銆�
@@ -101,12 +107,12 @@
@Transactional(rollbackFor = Exception.class)
public R update(TechnologyBom technologyBom) {
if (technologyBom.getId() == null) {
- throw new ServiceException("BOM id is required");
+ throw new ServiceException("BOM ID涓嶈兘涓虹┖");
}
validateProductModel(technologyBom.getProductModelId());
TechnologyBom oldBom = technologyBomMapper.selectById(technologyBom.getId());
if (oldBom == null) {
- throw new ServiceException("BOM not found");
+ throw new ServiceException("BOM涓嶅瓨鍦�");
}
if (oldBom.getProductModelId() != null && !oldBom.getProductModelId().equals(technologyBom.getProductModelId())) {
technologyRoutingMapper.updateProductModelByBomId(technologyBom.getProductModelId(), technologyBom.getId().longValue());
@@ -126,14 +132,14 @@
*/
@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");
+ throw new ServiceException("璇疯嚦灏戦�夋嫨涓�涓狟OM");
}
List<TechnologyRouting> list = technologyRoutingMapper.selectList(Wrappers.<TechnologyRouting>lambdaQuery()
.in(TechnologyRouting::getBomId, ids));
if (!list.isEmpty()) {
- throw new ServiceException("BOM is referenced by routing");
+ throw new ServiceException("BOM宸茶宸ヨ壓璺嚎寮曠敤锛屼笉鑳藉垹闄�");
}
technologyBomStructureService.remove(Wrappers.<TechnologyBomStructure>lambdaQuery()
.in(TechnologyBomStructure::getBomId, ids));
@@ -145,11 +151,11 @@
*/
private void validateProductModel(Long productModelId) {
if (productModelId == null) {
- throw new ServiceException("Product model is required");
+ throw new ServiceException("浜у搧瑙勬牸ID涓嶈兘涓虹┖");
}
ProductModel productModel = productModelService.getById(productModelId);
if (productModel == null) {
- throw new ServiceException("Product model not found");
+ throw new ServiceException("浜у搧瑙勬牸涓嶅瓨鍦�");
}
}
@@ -256,70 +262,99 @@
@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
+ @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) {
@@ -374,13 +409,78 @@
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);
}
}
+
+ /**
+ * 閫掑綊杞崲鏍戝舰缁撴瀯 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