From 39e8f88af6d3c07c183cda4e7c1d1b1c850209f5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 18 六月 2026 15:58:59 +0800
Subject: [PATCH] 生产报废、废品发货退货后、不合格处理报废的产品都要进到废品库

---
 src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index bd6f2df..58754d1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -398,6 +398,7 @@
                 .selectBatchIds(new ArrayList<>(operationIds))
                 .stream()
                 .filter(Objects::nonNull)
+                .filter(op -> op.getType() != null)  // 杩囨护 type 涓� null 鐨勮褰�
                 .collect(Collectors.toMap(
                         ProductionOrderRoutingOperation::getId,
                         ProductionOrderRoutingOperation::getType,

--
Gitblit v1.9.3