From 6f0df10fdd0e55e5ed3e31b1720efd25e2bf02fb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 16 九月 2026 18:51:12 +0800
Subject: [PATCH] fix: 添加条件过滤以确保查询结果中合格数量大于零
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 86 ++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 53 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 3130951..bbc1aff 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -9,6 +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.production.mapper.ProductionOrderRoutingMapper;
+import com.ruoyi.production.pojo.ProductionOrderRouting;
import com.ruoyi.technology.mapper.*;
import com.ruoyi.technology.pojo.*;
import com.ruoyi.technology.service.TechnologyRoutingService;
@@ -18,10 +20,9 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
@Service
@@ -39,6 +40,8 @@
private final TechnologyOperationParamMapper technologyOperationParamMapper;
private final TechnologyParamMapper technologyParamMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
+
+ private final ProductionOrderRoutingMapper productionOrderRoutingMapper;
@Override
public IPage<TechnologyRoutingVo> pageTechnologyRouting(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
@@ -79,6 +82,13 @@
if (ids == null || ids.isEmpty()) {
return false;
}
+ // 鍒ゆ柇鏄惁鏈夌敓浜ц鍗曠粦瀹氳宸ヨ壓璺嚎
+ Long count = productionOrderRoutingMapper.selectCount(
+ Wrappers.<ProductionOrderRouting>lambdaQuery()
+ .in(ProductionOrderRouting::getTechnologyRoutingId, ids));
+ if (count > 0) {
+ throw new ServiceException("璇ュ伐鑹鸿矾绾垮凡缁戝畾鐢熶骇璁㈠崟锛屾棤娉曞垹闄わ紒");
+ }
List<TechnologyRoutingOperation> routingOperationList = technologyRoutingOperationMapper.selectList(
Wrappers.<TechnologyRoutingOperation>lambdaQuery()
.in(TechnologyRoutingOperation::getTechnologyRoutingId, ids));
@@ -94,9 +104,10 @@
/**
* 鎸夊綋鍓嶉�夋嫨鐨� BOM 閲嶅缓宸ヨ壓璺嚎宸ュ簭锛�
- * 1. 鍏堝垹闄よ宸ヨ壓璺嚎涓嬪凡鏈夊伐搴�
- * 2. 璇诲彇 BOM 缁撴瀯涓殑 operation_id
- * 3. 鎸� BOM 鍑虹幇椤哄簭鍘婚噸鍚庨噸鏂板啓鍏ュ伐鑹鸿矾绾垮伐搴忚〃
+ * 1. 鍏堝垹闄よ宸ヨ壓璺嚎涓嬪凡鏈夊伐搴忓強鍙傛暟蹇収
+ * 2. 璇诲彇鎵佸钩 BOM 鏄庣粏涓殑 operation_id
+ * 3. 鎸� BOM 涓娆″嚭鐜扮殑椤哄簭瀵瑰伐搴忓幓閲嶏紝姣忛亾宸ュ簭鐢熸垚涓�鏉¤矾绾垮伐搴�
+ * 4. 姣忔潯璺嚎宸ュ簭鐨勪骇鍑鸿鏍煎浐瀹氫负宸ヨ壓璺嚎鐨勬垚鍝佽鏍�
*/
private void syncRoutingOperationsByBom(TechnologyRouting technologyRouting) {
List<TechnologyRoutingOperation> oldRoutingOperationList = technologyRoutingOperationMapper.selectList(
@@ -122,56 +133,26 @@
throw new ServiceException("bom浜у搧缁撴瀯涓虹┖锛�");
}
- // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝鎸夌収涓婁竴灞傜殑鐖惰妭鐐圭殑浜у搧鏄惁鐩稿悓鍜屽伐搴忔槸鍚︾浉鍚�
- Map<Long, TechnologyBomStructure> structureById = new HashMap<>();
+ // 鎵佸钩 BOM 涓涓墿鏂欏彲浠ユ寚鍚戝悓涓�閬撳伐搴忥紝杩欓噷鍙寜宸ュ簭鍘婚噸
+ Set<Long> uniqueOperationIdList = new LinkedHashSet<>();
for (TechnologyBomStructure bomStructure : bomStructures) {
- 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);
+ uniqueOperationIdList.add(bomStructure.getOperationId());
}
int dragSort = 1;
- for (TechnologyBomStructure bomStructure : uniqueOperationMap.values()) {
+ for (Long operationId : uniqueOperationIdList) {
TechnologyRoutingOperation routingOperation = new TechnologyRoutingOperation();
routingOperation.setTechnologyRoutingId(technologyRouting.getId());
- routingOperation.setProductModelId(resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId()));
- routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
+ routingOperation.setProductModelId(technologyRouting.getProductModelId());
+ routingOperation.setTechnologyOperationId(operationId);
routingOperation.setDragSort(dragSort++);
- routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
+ TechnologyOperation technologyOperation = getOperation(operationId);
+ routingOperation.setIsQuality(technologyOperation != null ? technologyOperation.getIsQuality() : null);
+ routingOperation.setIsProduction(technologyOperation != null ? technologyOperation.getIsProduction() : null);
+ routingOperation.setType(technologyOperation != null ? technologyOperation.getType() : null);
technologyRoutingOperationMapper.insert(routingOperation);
- syncRoutingOperationParams(routingOperation.getId(), bomStructure.getOperationId());
+ syncRoutingOperationParams(routingOperation.getId(), operationId);
}
- }
-
- 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) {
@@ -204,12 +185,11 @@
}
}
- /**
- * 璐ㄦ鏍囪瘑浠ュ伐搴忓熀纭�琛ㄥ畾涔変负鍑嗐��
- */
- private Boolean getOperationQuality(Long operationId) {
- TechnologyOperation technologyOperation = technologyOperationMapper.selectById(operationId);
- return technologyOperation != null ? technologyOperation.getIsQuality() : null;
+ private TechnologyOperation getOperation(Long operationId) {
+ if (operationId == null) {
+ return null;
+ }
+ return technologyOperationMapper.selectById(operationId);
}
private String buildProcessRouteCode(Long id) {
--
Gitblit v1.9.3