From 8e546c5b456b16bf766f8a27bb71a66b151554d7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 07 四月 2026 09:20:07 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 b334365..ea427f8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -73,7 +73,9 @@
*/
public Long countChild(Long productModelId) {
ProductBom productBom = productBomMapper.selectOne(new LambdaQueryWrapper<ProductBom>()
- .eq(ProductBom::getProductModelId, productModelId));
+ .eq(ProductBom::getProductModelId, productModelId)
+ .orderByDesc(ProductBom::getId)
+ .last("limit 1"));
if(productBom != null){
return productStructureService.countBybomId(productBom.getId());
}
@@ -137,15 +139,7 @@
ProductBom bom,ProductModel rootModel,
Map<String, Long> processMap,
List<BomImportErrorDto> errorList ) {
- // 1. 鑾峰彇children涓瓙椤逛骇鍝佺紪鍙蜂负绌虹殑鏁版嵁
- List<BomImportDto> parentChildren = children
- .stream()
- .filter(child -> StringUtils.isEmpty(child.getChildCode()))
- .collect(Collectors.toList());
- if(CollectionUtils.isEmpty(parentChildren)){
- return;
- }
- BomImportDto parentId = parentChildren.get(0); // 鐖剁骇鏁版嵁
+
ProductStructure rootNode = new ProductStructure();
rootNode.setBomId(bom.getId());
rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
@@ -161,7 +155,7 @@
continue;
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
- ProductModel childModel = findModel(child.getChildName(), child.getChildSpec());
+ ProductModel childModel = findModel(child.getChildName(), child.getChildCode());
if(childModel.getId() == null){
BomImportErrorDto errorDto = new BomImportErrorDto();
BeanUtils.copyProperties(child, errorDto);
@@ -217,7 +211,7 @@
// 鍒涘缓 BOM 鏁版嵁
BomImportDto first = entry.getValue().get(0);
- ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
+ ProductModel rootModel = findModel(first.getParentName(), first.getParentCode());
if(rootModel.getId() == null){
BomImportErrorDto error = new BomImportErrorDto();
BeanUtils.copyProperties(first, error);
--
Gitblit v1.9.3