diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
index ac286e6c3..d5c46c235 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
@@ -337,22 +337,24 @@ public class StockShelfOrderApplicationService {
         List<ShelfMaterialDetailDO> shelfMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
         shelfMaterialDetailDOList.forEach(shelfMaterialDetailDO -> {
             List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList1 = shelfMaterialDetailDO.getChildren();
-            ShelfMaterialDetailDO shelfMaterialDetailDOChildren = null;
-            List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList11 = shelfMaterialDetailDO.getChildren().stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList());
-            if (shelfMaterialDetailDOChildrenList11 != null && !shelfMaterialDetailDOChildrenList11.isEmpty() && shelfMaterialDetailDOChildrenList11.size() != 0) shelfMaterialDetailDOChildren = shelfMaterialDetailDOChildrenList11.get(0);
-            if (shelfMaterialDetailDOChildren != null) {
-                shelfMaterialDetailDO.setMaterialDetailId(shelfMaterialDetailDOChildren.getMaterialDetailId());
-                shelfMaterialDetailDO.setShelvesQuantity(shelfMaterialDetailDOChildren.getShelvesQuantity());
-                shelfMaterialDetailDO.setWarehouseId(shelfMaterialDetailDOChildren.getWarehouseId());
-                shelfMaterialDetailDO.setStorageSectionId(shelfMaterialDetailDOChildren.getStorageSectionId());
-                shelfMaterialDetailDO.setStorageLocationId(shelfMaterialDetailDOChildren.getStorageLocationId());
-                shelfMaterialDetailDO.setContainerId(shelfMaterialDetailDOChildren.getContainerId());
-                shelfMaterialDetailDO.setLevel(shelfMaterialDetailDOChildren.getLevel());
-                shelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+            if (shelfMaterialDetailDOChildrenList1 != null && !shelfMaterialDetailDOChildrenList1.isEmpty() && shelfMaterialDetailDOChildrenList1.size() > 0) {
+                ShelfMaterialDetailDO shelfMaterialDetailDOChildren = null;
+                List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList11 = shelfMaterialDetailDO.getChildren().stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList());
+                if (shelfMaterialDetailDOChildrenList11 != null && !shelfMaterialDetailDOChildrenList11.isEmpty() && shelfMaterialDetailDOChildrenList11.size() > 0) shelfMaterialDetailDOChildren = shelfMaterialDetailDOChildrenList11.get(0);
+                if (shelfMaterialDetailDOChildren != null) {
+                    shelfMaterialDetailDO.setMaterialDetailId(shelfMaterialDetailDOChildren.getMaterialDetailId());
+                    shelfMaterialDetailDO.setShelvesQuantity(shelfMaterialDetailDOChildren.getShelvesQuantity());
+                    shelfMaterialDetailDO.setWarehouseId(shelfMaterialDetailDOChildren.getWarehouseId());
+                    shelfMaterialDetailDO.setStorageSectionId(shelfMaterialDetailDOChildren.getStorageSectionId());
+                    shelfMaterialDetailDO.setStorageLocationId(shelfMaterialDetailDOChildren.getStorageLocationId());
+                    shelfMaterialDetailDO.setContainerId(shelfMaterialDetailDOChildren.getContainerId());
+                    shelfMaterialDetailDO.setLevel(shelfMaterialDetailDOChildren.getLevel());
+                    shelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+                }
+                //只留二级
+                List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList2 = shelfMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
+                shelfMaterialDetailDO.setChildren(shelfMaterialDetailDOChildrenList2);
             }
-            //只留二级
-            List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList2 = shelfMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
-            shelfMaterialDetailDO.setChildren(shelfMaterialDetailDOChildrenList2);
         });
         //上架装配参数
         StockShelfOrderDO assembleStockShelfOrderDO = assembleParamByShelf(stockReceiptOrderDO);