采购退货申请查询主子表详情信息接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.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.purchasereturnRequest.vo.*;
+import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestDetailDO;
+import com.win.module.wms.service.purchasereturnRequest.PurchasereturnRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class PurchasereturnRequestMainController {
     @Resource
     private PurchasereturnRequestMainService purchasereturnRequestMainService;
 
+    @Resource
+    private PurchasereturnRequestDetailService purchasereturnRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class PurchasereturnRequestMainController {
         ExcelUtils.write(response, "采购退货申请主.xls", "数据", PurchasereturnRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getPurchasereturnRequestById")
+    @Operation(summary = "APP获得采购退货申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:query')")
+    public CommonResult<PurchasereturnRequestMainRespVO> getPurchasereturnRequestById(@RequestParam("id") Long id) {
+        PurchasereturnRequestMainDO purchasereturnRequestMain = purchasereturnRequestMainService.getPurchasereturnRequestMain(id);
+        PurchasereturnRequestMainRespVO result = PurchasereturnRequestMainConvert.INSTANCE.convert(purchasereturnRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        PurchasereturnRequestDetailExportReqVO reqVO = new PurchasereturnRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<PurchasereturnRequestDetailDO>  list = purchasereturnRequestDetailService.getPurchasereturnRequestDetailList(reqVO);
+        List<PurchasereturnRequestDetailExcelVO> vos = PurchasereturnRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java

@@ -92,4 +92,7 @@ public class PurchasereturnRequestDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.purchasereturnRequest.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 PurchasereturnRequestMainRespVO extends PurchasereturnRequestMainBaseVO {
 
+    @Schema(description = " 采购退货申请子表request_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java

@@ -54,6 +54,7 @@ public interface PurchasereturnRequestDetailMapper extends BaseMapperX<Purchaser
     }
     default List<PurchasereturnRequestDetailDO> selectList(PurchasereturnRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PurchasereturnRequestDetailDO>()
+                .eqIfPresent(PurchasereturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getBatch, reqVO.getBatch())