From c3c2b034ee9811c4872dde22bb2b4fe9409a9549 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 11 四月 2026 11:32:23 +0800
Subject: [PATCH] yys 1.工艺路线带入bom清单工序
---
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 6b43c18..8a45d99 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -27,7 +27,7 @@
@Transactional
public Boolean addProductStructureDto(ProductStructureDto dto) {
- Long bomId = dto.getBomId();
+ Integer bomId = dto.getBomId();
// 灏嗘爲鎵佸钩鍖�
List<ProductStructureDto> flatDtoList = new ArrayList<>();
@@ -130,7 +130,7 @@
@Override
- public List<ProductStructureDto> listBybomId(Long bomId) {
+ public List<ProductStructureDto> listBybomId(Integer bomId) {
List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
Map<Long, ProductStructureDto> map = new HashMap<>();
@@ -154,4 +154,18 @@
return tree;
}
+ @Override
+ public List<ProductStructureDto> listDetailBybomId(Integer bomId) {
+ List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
+ Map<String, ProductStructureDto> distinctMap = new LinkedHashMap<>();
+ for (ProductStructureDto dto : list) {
+ if (dto.getParentId() == null || dto.getParentId() == 0) {
+ continue;
+ }
+ String key = dto.getProcessId() == null ? "NULL_PROCESS_" + dto.getId() : String.valueOf(dto.getProcessId());
+ distinctMap.putIfAbsent(key, dto);
+ }
+ return new ArrayList<>(distinctMap.values());
+ }
+
}
--
Gitblit v1.9.3