From c4174bbb103d95d6cd4714d3cc3070559444d70e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:17:41 +0800
Subject: [PATCH] 删除无用代码
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
index d225f7c..4079f84 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.technology.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,20 +9,8 @@
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
-import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
-import com.ruoyi.technology.mapper.TechnologyOperationMapper;
-import com.ruoyi.technology.mapper.TechnologyOperationParamMapper;
-import com.ruoyi.technology.mapper.TechnologyParamMapper;
-import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
-import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;
-import com.ruoyi.technology.mapper.TechnologyRoutingOperationParamMapper;
-import com.ruoyi.technology.pojo.TechnologyBomStructure;
-import com.ruoyi.technology.pojo.TechnologyOperation;
-import com.ruoyi.technology.pojo.TechnologyOperationParam;
-import com.ruoyi.technology.pojo.TechnologyParam;
-import com.ruoyi.technology.pojo.TechnologyRouting;
-import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
-import com.ruoyi.technology.pojo.TechnologyRoutingOperationParam;
+import com.ruoyi.technology.mapper.*;
+import com.ruoyi.technology.pojo.*;
import com.ruoyi.technology.service.TechnologyRoutingService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -31,6 +18,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -126,25 +114,33 @@
}
List<TechnologyBomStructure> bomStructures = technologyBomStructureMapper.selectList(
Wrappers.<TechnologyBomStructure>lambdaQuery()
- .eq(TechnologyBomStructure::getBomId, Long.valueOf(technologyRouting.getBomId()))
+ .eq(TechnologyBomStructure::getBomId, technologyRouting.getBomId())
.isNotNull(TechnologyBomStructure::getOperationId)
- .orderByAsc(TechnologyBomStructure::getId)
+ .orderByDesc(TechnologyBomStructure::getId)
);
if (bomStructures.isEmpty()) {
throw new ServiceException("bom浜у搧缁撴瀯涓虹┖锛�");
}
- // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝杩欓噷鎸夐娆″嚭鐜伴『搴忓幓閲嶃��
- Map<Long, TechnologyBomStructure> uniqueOperationMap = new LinkedHashMap<>();
+ // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝鎸夌収涓婁竴灞傜殑鐖惰妭鐐圭殑浜у搧鏄惁鐩稿悓鍜屽伐搴忔槸鍚︾浉鍚�
+ Map<Long, TechnologyBomStructure> structureById = new HashMap<>();
for (TechnologyBomStructure bomStructure : bomStructures) {
- uniqueOperationMap.putIfAbsent(bomStructure.getOperationId(), bomStructure);
+ if (bomStructure != null && bomStructure.getId() != null) {
+ structureById.put(bomStructure.getId(), bomStructure);
+ }
+ }
+
+ Map<String, TechnologyBomStructure> uniqueOperationMap = new LinkedHashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ Long outputProductModelId = resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId());
+ uniqueOperationMap.putIfAbsent(buildBomOperationDedupKey(bomStructure, outputProductModelId), bomStructure);
}
int dragSort = 1;
for (TechnologyBomStructure bomStructure : uniqueOperationMap.values()) {
TechnologyRoutingOperation routingOperation = new TechnologyRoutingOperation();
routingOperation.setTechnologyRoutingId(technologyRouting.getId());
- routingOperation.setProductModelId(technologyRouting.getProductModelId());
+ routingOperation.setProductModelId(resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId()));
routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
routingOperation.setDragSort(dragSort++);
routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
@@ -153,6 +149,31 @@
}
}
+ private String buildBomOperationDedupKey(TechnologyBomStructure bomStructure, Long outputProductModelId) {
+ Long operationId = bomStructure == null ? null : bomStructure.getOperationId();
+ Long parentId = bomStructure == null ? null : bomStructure.getParentId();
+ return operationId + "#"
+ + outputProductModelId + "#"
+ + parentId;
+ }
+
+ private Long resolveOutputProductModelId(TechnologyBomStructure bomStructure,
+ Map<Long, TechnologyBomStructure> structureById,
+ Long routingProductModelId) {
+ if (bomStructure == null) {
+ return routingProductModelId;
+ }
+ Long parentId = bomStructure.getParentId();
+ if (parentId == null) {
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+ TechnologyBomStructure parent = structureById.get(parentId);
+ if (parent != null && parent.getProductModelId() != null) {
+ return parent.getProductModelId();
+ }
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+
private void syncRoutingOperationParams(Long technologyRoutingOperationId, Long technologyOperationId) {
List<TechnologyOperationParam> operationParamList = technologyOperationParamMapper.selectList(
Wrappers.<TechnologyOperationParam>lambdaQuery()
--
Gitblit v1.9.3