diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java
index 0fcb2706..71cc6253 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.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.productdismantleJob.vo.*;
+import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert;
 import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert;
+import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO;
 import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO;
+import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService;
 import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductdismantleJobMainController {
     @Resource
     private ProductdismantleJobMainService productdismantleJobMainService;
 
+    @Resource
+    private ProductdismantleJobDetailService productdismantleJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductdismantleJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductdismantleJobById")
+    @Operation(summary = "APP获得制品收货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')")
+    public CommonResult<ProductdismantleJobMainRespVO> getProductdismantleJobById(@RequestParam("id") Long id) {
+        ProductdismantleJobMainDO productdismantleJobMain = productdismantleJobMainService.getProductdismantleJobMain(id);
+        ProductdismantleJobMainRespVO result = ProductdismantleJobMainConvert.INSTANCE.convert(productdismantleJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductdismantleJobDetailExportReqVO exportReqVO = new ProductdismantleJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<ProductdismantleJobDetailDO> productdismantleJobDetailList = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO);
+        List<ProductdismantleJobDetailExcelVO> productdismantleJobDetailExcelVOS = ProductdismantleJobDetailConvert.INSTANCE.convertList02(productdismantleJobDetailList);
+        result.setSubList(productdismantleJobDetailExcelVOS);
+        return success(result);
+    }
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java
index d53a5c47..47a59a0c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java
@@ -93,4 +93,7 @@ public class ProductdismantleJobDetailExportReqVO {
     @Schema(description = "从货主代码")
     private String fromOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java
index a2bafa3d..2f02afc3 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java
@@ -3,10 +3,14 @@ package com.win.module.wms.controller.productdismantleJob.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 ProductdismantleJobMainRespVO extends ProductdismantleJobMainBaseVO {
 
+    @Schema(description = "制品拆解任务子表job_productdismantle_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }