diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java
index f924cdbc..8aadad9e 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.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.unplannedreceiptRequest.vo.*;
+import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO;
+import com.win.module.wms.service.unplannedreceiptRequest.UnplannedreceiptRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +37,9 @@ public class UnplannedreceiptRequestMainController {
     @Resource
     private UnplannedreceiptRequestMainService unplannedreceiptRequestMainService;
 
+    @Resource
+    private UnplannedreceiptRequestDetailService unplannedreceiptRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -117,4 +123,22 @@ public class UnplannedreceiptRequestMainController {
         ExcelUtils.write(response, "计划外入库申请主.xls", "数据", UnplannedreceiptRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedreceiptRequestById")
+    @Operation(summary = "APP获得计划外入库申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-request-main:query')")
+    public CommonResult<UnplannedreceiptRequestMainRespVO> getUnplannedreceiptRequestById(@RequestParam("id") Long id) {
+        UnplannedreceiptRequestMainDO unplannedreceiptRequestMain = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMain(id);
+        UnplannedreceiptRequestMainRespVO result = UnplannedreceiptRequestMainConvert.INSTANCE.convert(unplannedreceiptRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedreceiptRequestDetailExportReqVO reqVO = new UnplannedreceiptRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<UnplannedreceiptRequestDetailDO> list = unplannedreceiptRequestDetailService.getUnplannedreceiptRequestDetailList(reqVO);
+        List<UnplannedreceiptRequestDetailExcelVO> vos = UnplannedreceiptRequestDetailConvert.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/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java
index 22b21115..5a6d8f81 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java
@@ -5,7 +5,6 @@ import lombok.*;
 import java.math.BigDecimal;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
 import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -62,7 +61,7 @@ public class UnplannedreceiptRequestDetailExportReqVO {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] creationTime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者用户名")
     private String creator;
@@ -92,4 +91,7 @@ public class UnplannedreceiptRequestDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java
index c7f36a7d..a2454f1a 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java
@@ -64,7 +64,7 @@ public class UnplannedreceiptRequestDetailPageReqVO extends PageParam {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] creationTime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者用户名")
     private String creator;
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainRespVO.java
index 1c383849..ebfa39ee 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainRespVO.java
@@ -3,10 +3,14 @@ package com.win.module.wms.controller.unplannedreceiptRequest.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 UnplannedreceiptRequestMainRespVO extends UnplannedreceiptRequestMainBaseVO {
 
+    @Schema(description = "计划外入库申请子表request_unplannedreceipt_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/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java
index 5aa8ad7d..2dd66bdd 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java
@@ -1,13 +1,8 @@
 package com.win.module.wms.dal.dataobject.unplannedreceiptRequest;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 
@@ -94,10 +89,6 @@ public class UnplannedreceiptRequestDetailDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime creationTime;
     /**
      * 地点ID
      */
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java
index a5e62d3b..6e99f01f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java
@@ -38,7 +38,7 @@ public interface UnplannedreceiptRequestDetailMapper extends BaseMapperX<Unplann
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(UnplannedreceiptRequestDetailDO::getCreationTime, reqVO.getCreationTime())
+                .betweenIfPresent(UnplannedreceiptRequestDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getCreator, reqVO.getCreator())
                 .likeIfPresent(UnplannedreceiptRequestDetailDO::getItemName, reqVO.getItemName())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())
@@ -53,6 +53,7 @@ public interface UnplannedreceiptRequestDetailMapper extends BaseMapperX<Unplann
 
     default List<UnplannedreceiptRequestDetailDO> selectList(UnplannedreceiptRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<UnplannedreceiptRequestDetailDO>()
+                .eqIfPresent(UnplannedreceiptRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
@@ -67,7 +68,7 @@ public interface UnplannedreceiptRequestDetailMapper extends BaseMapperX<Unplann
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(UnplannedreceiptRequestDetailDO::getCreationTime, reqVO.getCreationTime())
+                .betweenIfPresent(UnplannedreceiptRequestDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getCreator, reqVO.getCreator())
                 .likeIfPresent(UnplannedreceiptRequestDetailDO::getItemName, reqVO.getItemName())
                 .eqIfPresent(UnplannedreceiptRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())