From b179a58f92528a0c0fe9bc8c657c19bc493812d8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 07 九月 2026 17:38:15 +0800
Subject: [PATCH] fix: 增强BOM导入功能，添加工序ID绑定及错误提示
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 199 ++++++++++++++++++++++++++++---------------------
1 files changed, 114 insertions(+), 85 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 2a4cd1d..693ab94 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/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鍒楄〃銆�
@@ -108,12 +110,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());
@@ -135,12 +137,12 @@
@Transactional(rollbackFor = Exception.class)
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));
@@ -152,11 +154,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("浜у搧瑙勬牸涓嶅瓨鍦�");
}
}
@@ -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("瀵煎叆澶辫触: 棣栬蹇呴』鏄疊OM鐖惰妭鐐�(鐖堕」淇℃伅琛�),瀛愰」鍓嶉渶鍏堝畾涔夌埗椤�");
+ }
// 鎵惧埌鐖惰妭鐐瑰湪鏁版嵁搴撻噷鐨� 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("瀵煎叆澶辫触: 鏈壘鍒癇OM鐖惰妭鐐硅");
+ }
+
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);
}
--
Gitblit v1.9.3