From 5ac4f450b6b4bd726cefb57a626a46c56dbbc42e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 16:01:12 +0800
Subject: [PATCH] fix: BOM导入去除单层限制
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 90 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
index 1878211..9659cdd 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -121,8 +121,6 @@
.collect(Collectors.toMap(ProductProcess::getName, ProductProcess::getId, (k1, k2) -> k1));
// 鍒涘缓 BOM 鏁版嵁
- BomImportDto first = list.get(0);
- ProductMaterialSku rootModel = findModel(first.getParentName(), first.getParentSpec());
ProductBom bom = new ProductBom();
bom.setDictCode(dictCode);
bom.setVersion("1.0");
@@ -133,58 +131,74 @@
// 璁板綍宸茬粡鎻掑叆缁撴瀯鐨勮妭鐐癸細Key = "鍚嶇О+瑙勬牸", Value = structure_id
Map<String, Long> treePathMap = new HashMap<>();
- 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();
+ for (BomImportDto dto : list) {
+ String parentName = dto.getParentName();
+ String parentSpec = dto.getParentSpec();
+ String childName = dto.getChildName();
+ String childSpec = dto.getChildSpec();
- //澶勭悊鏍硅妭鐐�,绗竴琛屼笖瀛愰」涓虹┖
- if (i == 0 && StringUtils.isBlank(dto.getChildName())) {
- ProductStructure rootNode = new ProductStructure();
- rootNode.setBomId(bom.getId());
- rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
- rootNode.setProductModelId(rootModel.getId());
- rootNode.setUnitQuantity(BigDecimal.ONE);
- ProductMaterial rootMaterial = productMaterialService.getById(rootModel.getProductId());
- rootNode.setUnit(rootMaterial != null ? rootMaterial.getUnit() : null);
- productStructureService.save(rootNode);
+ String parentKey = parentName + "|" + (parentSpec == null ? "" : parentSpec);
+ String childKey = childName + "|" + (childSpec == null ? "" : childSpec);
- treePathMap.put(parentKey, rootNode.getId());
+ // 澶勭悊椤剁骇鑺傜偣 (瀛愰」鍙婂叾瑙勬牸鍧囦负绌哄綋浣滈《绾ц妭鐐瑰畾涔�)
+ if (StringUtils.isBlank(childName) && StringUtils.isBlank(childSpec)) {
+ if (!treePathMap.containsKey(parentKey)) {
+ ProductMaterialSku model = findModel(parentName, parentSpec);
+ ProductStructure node = saveStructure(bom.getId(), null, model, dto.getUnitQty(), null);
+ treePathMap.put(parentKey, node.getId());
+ } else {
+ // 濡傛灉宸茬粡瀛樺湪锛屼粎鍦ㄥ畠鏄《绾ц妭鐐规椂鏇存柊
+ Long structureId = treePathMap.get(parentKey);
+ ProductStructure node = productStructureService.getById(structureId);
+ if (node != null && node.getParentId() == null && dto.getUnitQty() != null) {
+ node.setUnitQuantity(dto.getUnitQty());
+ productStructureService.updateById(node);
+ }
+ }
continue;
}
- // 澶勭悊瀛愬眰绾ц妭鐐�
- // 鎵惧埌鐖惰妭鐐瑰湪鏁版嵁搴撻噷鐨� ID
+ // 澶勭悊鐖跺瓙灞傜骇鍏崇郴
Long parentStructureId = treePathMap.get(parentKey);
if (parentStructureId == null) {
- // 濡傛灉 Map 閲屾壘涓嶅埌锛岃鏄� Excel 椤哄簭涔变簡鎴栬�呮暟鎹湁璇�
- throw new ServiceException("瀵煎叆澶辫触: 鐖堕」[" + dto.getParentName() + "]蹇呴』鍦ㄥ叾瀛愰」涔嬪墠瀹氫箟");
+ // 濡傛灉 Map 閲屾壘涓嶅埌鐖惰妭鐐癸紝瑙嗕负椤剁骇鐖惰妭鐐�
+ ProductMaterialSku parentModel = findModel(parentName, parentSpec);
+ ProductStructure parentNode = saveStructure(bom.getId(), null, parentModel, BigDecimal.ONE, null);
+ parentStructureId = parentNode.getId();
+ treePathMap.put(parentKey, parentStructureId);
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
- ProductMaterialSku childModel = findModel(dto.getChildName(), dto.getChildSpec());
-
- // 鎻掑叆缁撴瀯琛�
- ProductStructure node = new ProductStructure();
- node.setBomId(bom.getId());
- node.setParentId(parentStructureId); // 鐖惰妭鐐笽D
- node.setProductModelId(childModel.getId());
- node.setUnitQuantity(dto.getUnitQty());
- ProductMaterial childMaterial = productMaterialService.getById(childModel.getProductId());
- node.setUnit(childMaterial != null ? childMaterial.getUnit() : null);
- if (processMap.containsKey(dto.getProcess())) {
- node.setProcessId(processMap.get(dto.getProcess()));
+ ProductMaterialSku childModel = findModel(childName, childSpec);
+ Long processId = null;
+ if (StringUtils.isNotBlank(dto.getProcess())) {
+ processId = processMap.get(dto.getProcess());
}
- productStructureService.save(node);
-
- // 鎶婂綋鍓嶅瓙椤硅褰曞埌 Map,浣滀负浠ュ悗鏇存繁灞傜骇鐨勭埗椤规煡鎵句緷鎹�
- // 鍚屼竴鐖堕」涓嬬殑鍚屽悕瀛愰」涓嶉渶瑕侀噸澶嶈褰�
- treePathMap.put(childKey, node.getId());
+ // 鎻掑叆瀛愯妭鐐圭粨鏋勮〃
+ ProductStructure childNode = saveStructure(bom.getId(), parentStructureId, childModel, dto.getUnitQty(), processId);
+ // 鎶婂綋鍓嶅瓙椤硅褰曞埌 Map,浣滀负浠ュ悗鏇存繁灞傜骇鐨勭埗椤规煡鎵句緷鎹�
+ treePathMap.put(childKey, childNode.getId());
}
return AjaxResult.success("BOM瀵煎叆鎴愬姛");
}
+ /**
+ * 淇濆瓨缁撴瀯鑺傜偣
+ */
+ private ProductStructure saveStructure(Integer bomId, Long parentId, ProductMaterialSku model, BigDecimal qty, Long processId) {
+ ProductStructure node = new ProductStructure();
+ node.setBomId(bomId);
+ node.setParentId(parentId);
+ node.setProductModelId(model.getId());
+ node.setUnitQuantity(qty != null ? qty : BigDecimal.ONE);
+ ProductMaterial material = productMaterialService.getById(model.getProductId());
+ node.setUnit(material != null ? material.getUnit() : null);
+ node.setProcessId(processId);
+ productStructureService.save(node);
+ return node;
+ }
+
@Override
public void exportBom(HttpServletResponse response, Integer bomId) {
--
Gitblit v1.9.3