From f01bf43c8b12a94307dbc5bed8b5c0fc10870393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 16 Mar 2026 11:36:09 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E4=B8=8A=E6=9E=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ShelfMaterialDetailImpl.java        | 13 +++++++++++--
 .../stockShelfOrder/StockShelfOrderApi.java         |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
index 9a68fb0ad..b51e059e5 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
@@ -87,9 +87,18 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
             shelfMaterialDetailPO.setMaterialMoreDetailList(materialMoreDetailList);
         });
         
-        // 获取查询的层级
+        // 获取查询的层级：level 1 为顶级；level 2 且 parent_unique_id 为 null/0 的为孤儿项；
+        // level 2 且 parent_unique_id 在上架明细中无对应父项的也为孤儿（如 PDA 只上架子项、父项未生成），均作为顶级展示
+        java.util.Set<Long> shelfParentIds = shelfMaterialDetailPOList.stream()
+                .filter(po -> po.getUniqueId() != null)
+                .map(ShelfMaterialDetailPO::getUniqueId)
+                .collect(Collectors.toSet());
         List<ShelfMaterialDetailPO> receiptMaterialDetailPOParentList = shelfMaterialDetailPOList
-                .stream().filter(e -> 1 == e.getLevel()).collect(Collectors.toList());
+                .stream().filter(e -> e.getLevel() != null && (
+                        1 == e.getLevel()
+                        || (2 == e.getLevel() && (e.getParentUniqueId() == null || Long.valueOf(0).equals(e.getParentUniqueId())))
+                        || (2 == e.getLevel() && e.getParentUniqueId() != null && !shelfParentIds.contains(e.getParentUniqueId()))
+                )).collect(Collectors.toList());
         // 递归查询子集
         for(ShelfMaterialDetailPO materialDetailPO : receiptMaterialDetailPOParentList){
             List<ShelfMaterialDetailPO> children = getChildren(materialDetailPO.getUniqueId(), shelfMaterialDetailPOList, 2);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java
index 457490cca..89b529895 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java
@@ -55,13 +55,13 @@ public class StockShelfOrderApi extends BaseController {
     }
 
     /**
-     * 获取上架单详细信息
+     * 获取上架单详细信息（与 PDA 一致添加 parent_copy，确保 PC 详情页从 children 读取时能展示物料明细）
      */
     @ApiOperation("获取上架单")
     @GetMapping(value = "/getInfo/{shelfOrderId}")
     public AjaxResult getInfo(@PathVariable("shelfOrderId") Long shelfOrderId)
     {
-        return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId));
+        return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true));
     }
 
     @ApiOperation("任务下发")