diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java
index ffadb35f..78a69cfa 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java
@@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.productputawayRequest.vo.*;
+import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert;
 import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
+import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService;
 import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductputawayRequestMainController {
     @Resource
     private ProductputawayRequestMainService productputawayRequestMainService;
 
+    @Resource
+    private ProductputawayRequestDetailService productputawayRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,23 @@ public class ProductputawayRequestMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductputawayRequestById")
+    @Operation(summary = "APP获得制品上架申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:query')")
+    public CommonResult<ProductputawayRequestMainRespVO> getProductputawayRequestById(@RequestParam("id") Long id) {
+        ProductputawayRequestMainDO productputawayRequestMain = productputawayRequestMainService.getProductputawayRequestMain(id);
+        ProductputawayRequestMainRespVO result = ProductputawayRequestMainConvert.INSTANCE.convert(productputawayRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductputawayRequestDetailExportReqVO reqVO = new ProductputawayRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ProductputawayRequestDetailDO> list = productputawayRequestDetailService.getProductputawayRequestDetailList(reqVO);
+        List<ProductputawayRequestDetailExcelVO> vos = ProductputawayRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java
index 6968f166..42724934 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java
@@ -83,4 +83,8 @@ public class ProductputawayRequestDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java
index a53314e9..53626675 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java
@@ -3,6 +3,8 @@ package com.win.module.wms.controller.productputawayRequest.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 制品上架申请主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -12,4 +14,7 @@ public class ProductputawayRequestMainRespVO extends ProductputawayRequestMainBa
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
+    @Schema(description = "制品上架申请子表request_productputaway_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java
index 754ae1f6..6f3be0a7 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java
@@ -53,6 +53,7 @@ public interface ProductputawayRequestDetailMapper extends BaseMapperX<Productpu
 
     default List<ProductputawayRequestDetailDO> selectList(ProductputawayRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayRequestDetailDO>()
+                .eqIfPresent(ProductputawayRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductputawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(ProductputawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(ProductputawayRequestDetailDO::getBatch, reqVO.getBatch())