From c6015b2acba3e4a60045f7f3d275618cc9e554e7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 17:41:17 +0800
Subject: [PATCH] fix(production): 报工参数补全过滤空工单，修复报工台账查询报错
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 4a8366a..8b3a072 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -155,6 +155,8 @@
Map<Long, Long> mainIdToTaskIdMap = mainList.stream()
.filter(Objects::nonNull)
.filter(item -> item.getId() != null)
+ // 鍘嗗彶鎶ュ伐鍙兘娌℃寕宸ュ崟锛宼oMap 涓嶅厑璁� null 鍊硷紝缂哄伐鍗曠殑鐩存帴璺宠繃
+ .filter(item -> item.getProductionOperationTaskId() != null)
.collect(Collectors.toMap(ProductionProductMain::getId,
ProductionProductMain::getProductionOperationTaskId, (left, right) -> left));
Set<Long> taskIdSet = mainIdToTaskIdMap.values().stream()
@@ -175,6 +177,8 @@
Map<Long, Long> taskIdToRoutingOperationIdMap = taskList.stream()
.filter(Objects::nonNull)
.filter(item -> item.getId() != null)
+ // 鍚屼笂锛氬伐鍗曟病鍏宠仈璁㈠崟宸ュ簭鏃惰烦杩囷紝閬垮厤 toMap 绌哄�� NPE
+ .filter(item -> item.getProductionOrderRoutingOperationId() != null)
.collect(Collectors.toMap(ProductionOperationTask::getId,
ProductionOperationTask::getProductionOrderRoutingOperationId, (left, right) -> left));
Set<Long> routingOperationIdSet = taskIdToRoutingOperationIdMap.values().stream()
--
Gitblit v1.9.3