diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java
index c369b6bb..f6df1ed6 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java
@@ -3,6 +3,9 @@ package com.win.module.wms.controller.repleinshJob;
 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.convert.repleinshJob.RepleinshJobDetailConvert;
+import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO;
+import com.win.module.wms.service.repleinshJob.RepleinshJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,9 @@ public class RepleinshJobMainController {
     @Resource
     private RepleinshJobMainService repleinshJobMainService;
 
+    @Resource
+    private RepleinshJobDetailService repleinshJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -120,4 +126,33 @@ public class RepleinshJobMainController {
         ExcelUtils.write(response, "补料任务主.xls", "数据", RepleinshJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getRepleinshJobById")
+    @Operation(summary = "APP获得补料任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:query')")
+    public CommonResult<RepleinshJobMainRespVO> getRepleinshJobById(@RequestParam("id") Long id) {
+        RepleinshJobMainDO repleinshJobMain = repleinshJobMainService.getRepleinshJobMain(id);
+        RepleinshJobMainRespVO result = RepleinshJobMainConvert.INSTANCE.convert(repleinshJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        RepleinshJobDetailExportReqVO repleinshJobDetailExportReqVO = new RepleinshJobDetailExportReqVO();
+        repleinshJobDetailExportReqVO.setMasterId(result.getId());
+        List<RepleinshJobDetailDO> repleinshJobDetailList = repleinshJobDetailService.getRepleinshJobDetailList(repleinshJobDetailExportReqVO);
+        List<RepleinshJobDetailExcelVO> repleinshJobDetailExcelVOS = RepleinshJobDetailConvert.INSTANCE.convertList02(repleinshJobDetailList);
+        result.setSubList(repleinshJobDetailExcelVOS);
+        return success(result);
+    }
+
+    @PostMapping("/getRepleinshJobbPageByStatusAndTime")
+    @Operation(summary = "APP获得补料任务主任务分页列表")
+    @Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]")
+    @Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-mainn:query')")
+    public CommonResult<PageResult<RepleinshJobMainRespVO>> getRepleinshJobbPageByStatusAndTime(@RequestBody RepleinshJobMainPageReqVO pageReqVO) {
+        PageResult<RepleinshJobMainDO> repleinshJobMainPage = repleinshJobMainService.getRepleinshJobMainPage(pageReqVO);
+        PageResult<RepleinshJobMainRespVO> result = RepleinshJobMainConvert.INSTANCE.convertPage(repleinshJobMainPage);
+        return success(result);
+    }
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java
index 9255015e..c187101a 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java
@@ -73,4 +73,7 @@ public class RepleinshJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID", example = "6060")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java
index 0276807b..10120dff 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java
@@ -130,4 +130,7 @@ public class RepleinshJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "任务状态数组列表")
+    private List Types;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainRespVO.java
index 131db07f..2ae4dc3d 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainRespVO.java
@@ -3,10 +3,15 @@ package com.win.module.wms.controller.repleinshJob.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 RepleinshJobMainRespVO extends RepleinshJobMainBaseVO {
 
+    @Schema(description = "补料任务子表job_repleinsh_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/repleinshJob/RepleinshJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java
index 2fad9e48..59a7da70 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java
@@ -22,6 +22,7 @@ public interface RepleinshJobMainMapper extends BaseMapperX<RepleinshJobMainDO>
 
     default PageResult<RepleinshJobMainDO> selectPage(RepleinshJobMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<RepleinshJobMainDO>()
+                .inIfPresent(RepleinshJobMainDO::getStatus, reqVO.getTypes())
                 .eqIfPresent(RepleinshJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .betweenIfPresent(RepleinshJobMainDO::getRequestTime, reqVO.getRequestTime())
                 .betweenIfPresent(RepleinshJobMainDO::getRequestDueTime, reqVO.getRequestDueTime())