From 485db7adccd4d8150bcf0c6de38e2cdefca098a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=AD=A3=E6=9D=A8?=
 <8915035+gao-zhengyang123@user.noreply.gitee.com>
Date: Tue, 3 Mar 2026 14:26:42 +0800
Subject: [PATCH] =?UTF-8?q?pda=E6=94=B6=E8=B4=A7=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockReceiptOrderApplicationService.java  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
index ab54e472b..b4bec23b1 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
@@ -783,15 +783,22 @@ public class StockReceiptOrderApplicationService {
         receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
             List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
             if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
-                ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
-                receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
-                receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
-                receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
-                receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
-                receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
-                receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
-                receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
-                receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+                //ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
+                ReceiptMaterialDetailDO receiptMaterialDetailDOChildren =
+                        receiptMaterialDetailDOChildrenList1.stream()
+                                .filter(p -> 1 == p.getLevel())
+                                .findFirst()  // 返回 Optional<ReceiptMaterialDetailDO>
+                                .orElse(null);  // 没有符合条件的元素时返回null（也可以自定义默认值）
+                if (receiptMaterialDetailDOChildren != null) {
+                    receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
+                    receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
+                    receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
+                    receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
+                    receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
+                    receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
+                    receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
+                    receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+                }
                 //只留二级
                 List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
                 receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);