diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java
index f0aaee10..d6b0ab97 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java
@@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.putawayRequest.vo.*;
+import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
+import com.win.module.wms.service.putawayRequest.PutawayRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +36,9 @@ public class PutawayRequestMainController {
 
     @Resource
     private PutawayRequestMainService putawayRequestMainService;
+
+    @Resource
+    private PutawayRequestDetailService putawayRequestDetailService;
     @Resource
     private AdminUserApi userApi;
 
@@ -115,4 +121,22 @@ public class PutawayRequestMainController {
         ExcelUtils.write(response, "上架申请主.xls", "数据", PutawayRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getPutawayRequestById")
+    @Operation(summary = "APP获得原料上架申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-request-main:query')")
+    public CommonResult<PutawayRequestMainRespVO> getPutawayRequestById(@RequestParam("id") Long id) {
+        PutawayRequestMainDO putawayRequestMain = putawayRequestMainService.getPutawayRequestMain(id);
+        PutawayRequestMainRespVO result = PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        PutawayRequestDetailExportReqVO reqVO = new PutawayRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<PutawayRequestDetailDO> putawayRequestDetailList = putawayRequestDetailService.getPutawayRequestDetailList(reqVO);
+        List<PutawayRequestDetailExcelVO> vos = PutawayRequestDetailConvert.INSTANCE.convertList02(putawayRequestDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java
index dbfe3cac..76a9c04f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java
@@ -83,4 +83,7 @@ public class PutawayRequestDetailExportReqVO {
     @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/putawayRequest/vo/PutawayRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java
index 5a7ce892..0e6de5be 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java
@@ -3,10 +3,15 @@ package com.win.module.wms.controller.putawayRequest.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 上架申请主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PutawayRequestMainRespVO extends PutawayRequestMainBaseVO {
 
+    @Schema(description = " 原料上架申请子表request_putaway_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/putawayRequest/PutawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java
index d99e9a7d..ff64c120 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java
@@ -51,6 +51,7 @@ public interface PutawayRequestDetailMapper extends BaseMapperX<PutawayRequestDe
     }
     default List<PutawayRequestDetailDO> selectList(PutawayRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PutawayRequestDetailDO>()
+                .eqIfPresent(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getBatch, reqVO.getBatch())