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 567a7eff..d2e63ef0 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
@@ -10,9 +10,12 @@ 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.enums.DictTypeConstants;
+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;
@@ -43,6 +46,9 @@ public class ProductputawayRequestMainController {
     @Resource
     private ProductputawayRequestMainService productputawayRequestMainService;
 
+    @Resource
+    private ProductputawayRequestDetailService productputawayRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -169,4 +175,22 @@ public class ProductputawayRequestMainController {
         }
         return success(returnMap);
     }
+
+    @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);
+    }
 }