客户退货申请查询主子表详情信息接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.customerreturnRequest;
 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.customerreturnRequest.CustomerreturnRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
+import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class CustomerreturnRequestMainController {
     @Resource
     private CustomerreturnRequestMainService customerreturnRequestMainService;
 
+    @Resource
+    private CustomerreturnRequestDetailService customerreturnRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class CustomerreturnRequestMainController {
         ExcelUtils.write(response, "客户退货申请主.xls", "数据", CustomerreturnRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getCustomerreturnRequestById")
+    @Operation(summary = "APP获得客户退货申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')")
+    public CommonResult<CustomerreturnRequestMainRespVO> getCustomerreturnRequestById(@RequestParam("id") Long id) {
+        CustomerreturnRequestMainDO customerreturnRequestMain = customerreturnRequestMainService.getCustomerreturnRequestMain(id);
+        CustomerreturnRequestMainRespVO result = CustomerreturnRequestMainConvert.INSTANCE.convert(customerreturnRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        CustomerreturnRequestDetailExportReqVO reqVO = new CustomerreturnRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<CustomerreturnRequestDetailDO> list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(reqVO);
+        List<CustomerreturnRequestDetailExcelVO> vos = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java

@@ -83,4 +83,7 @@ public class CustomerreturnRequestDetailExportReqVO {
     @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/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.customerreturnRequest.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 CustomerreturnRequestMainRespVO extends CustomerreturnRequestMainBaseVO {
 
+    @Schema(description = "客户退货申请子表request_customerreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java

@@ -51,6 +51,7 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX<Customerr
     }
     default List<CustomerreturnRequestDetailDO> selectList(CustomerreturnRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomerreturnRequestDetailDO>()
+                .eqIfPresent(CustomerreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())