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

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/repository/po/TaskMaterialPO.java

@@ -1,5 +1,6 @@
 package com.mhd.wms.domain.stockOutTaskOrder.repository.po;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mhd.common.core.annotation.Excel;
 import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.mhd.wms.domain.taskPickingMaterialDetail.repository.po.TaskPickingMaterialDetailPO;
@@ -68,4 +69,12 @@ public class TaskMaterialPO extends BaseVOEntity {
     @ApiModelProperty("拣货作业物料详情")
     private List<TaskPickingMaterialDetailPO> taskPickingMaterialDetailList;
 
+    /**
+     * 与 taskPickingMaterialDetailList 同值，供详情页从 children 读取（与收货单、上架单结构一致）
+     */
+    @JsonProperty("children")
+    public List<TaskPickingMaterialDetailPO> getChildren() {
+        return taskPickingMaterialDetailList;
+    }
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -228,10 +228,23 @@ public class StockReceiptOrderDomainService {
                     receiptMaterialDetailPOChildren.setQuantity(null);
                 });
             } else {
-                // 主项无子项时（点击分批收货前）：确保主项也有批次属性，否则 PDA 不显示
+                // 主项无子项时：添加 parent_copy 到 children，供详情页展示（详情页从 children 读取数据）
                 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<>());
+                if (CollectionUtils.isEmpty(parentCopy.getMaterialMoreDetailList())) {
+                    parentCopy.setMaterialMoreDetailList(receiptMaterialDetailPO.getMaterialMoreDetailList());
+                }
+                List<InMaterialDetailSerialNumberPO> serialList = inMaterialDetailSerialNumberMap.get(receiptMaterialDetailPO.getUniqueId());
+                parentCopy.setMaterialDetailSerialNumberList(serialList != null ? serialList : new ArrayList<>());
+                receiptMaterialDetailPOChildrenList = new ArrayList<>();
+                receiptMaterialDetailPOChildrenList.add(parentCopy);
             }
             receiptMaterialDetailPO.setChildren(receiptMaterialDetailPOChildrenList != null ? receiptMaterialDetailPOChildrenList : new ArrayList<>());
         });