diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java
index 5cb20393..61f54f23 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java
@@ -3,35 +3,28 @@ package com.win.module.wms.controller.productionreturnRequest;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.dict.core.util.DictFrameworkUtils;
-import com.win.framework.excel.core.util.ConvertUtil;
 import com.win.framework.excel.core.util.ExcelUtils;
 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.productionreturnRequest.vo.*;
-import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayImportErrorVO;
-import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayImportVO;
-import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO;
+import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
 import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
-import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
 import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 
 import static com.win.framework.common.pojo.CommonResult.success;
@@ -46,6 +39,9 @@ public class ProductionreturnRequestMainController {
     @Resource
     private ProductionreturnRequestMainService productionreturnRequestMainService;
 
+    @Resource
+    private ProductionreturnRequestDetailService productionreturnRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -130,5 +126,22 @@ public class ProductionreturnRequestMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductionreturnRequestById")
+    @Operation(summary = "APP获得生产退料申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')")
+    public CommonResult<ProductionreturnRequestMainRespVO> getProductionreturnRequestById(@RequestParam("id") Long id) {
+        ProductionreturnRequestMainDO productionreturnRequestMain = productionreturnRequestMainService.getProductionreturnRequestMain(id);
+        ProductionreturnRequestMainRespVO result = ProductionreturnRequestMainConvert.INSTANCE.convert(productionreturnRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductionreturnRequestDetailExportReqVO reqVO = new ProductionreturnRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ProductionreturnRequestDetailDO> list = productionreturnRequestDetailService.getProductionreturnRequestDetailList(reqVO);
+        List<ProductionreturnRequestDetailExcelVO> vos = ProductionreturnRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
 
 }