Merge remote-tracking branch 'origin/dev' into dev

2026-03-15 17:39:38 +08:00
parent 5eebfb4dd5 8aa0c66cf4
commit 388d763296
1 changed files with 8 additions and 1 deletions
@@ -228,11 +228,18 @@ public class StockReceiptOrderDomainService {
                    receiptMaterialDetailPOChildren.setQuantity(null);
                });
            } else {
-                // 主项无子项时：不添加 parent_copy，避免 PDA 端重复显示两条记录；主项自身已有全部数据，详情页可直接从主项读取
+                // 主项无子项时：添加 parent_copy 到 children，与上架一致，供 PDA 详情页从 children 读取数据展示（PDA 端与上架共用同一展示逻辑）
                if (CollectionUtils.isEmpty(receiptMaterialDetailPO.getMaterialMoreDetailList())) {
                    receiptMaterialDetailPO.setMaterialMoreDetailList(getMaterialMoreDetail(receiptMaterialDetailPO));
                }
+                ReceiptMaterialDetailPO parentCopy = new ReceiptMaterialDetailPO();
+                BeanUtils.copyProperties(receiptMaterialDetailPO, parentCopy, "children");
+                parentCopy.setLevel(2);
+                parentCopy.setParentUniqueId(receiptMaterialDetailPO.getUniqueId());
+                parentCopy.setQuantity(null);
+                parentCopy.setChildren(new ArrayList<>());
                receiptMaterialDetailPOChildrenList = new ArrayList<>();
+                receiptMaterialDetailPOChildrenList.add(parentCopy);
            }
            receiptMaterialDetailPO.setChildren(receiptMaterialDetailPOChildrenList != null ? receiptMaterialDetailPOChildrenList : new ArrayList<>());
        });