From a8047fe1e58dc0beebf6fecf9a2855fd08f69aaf Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 9 Nov 2023 11:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E8=AF=A2=E4=B8=BB=E5=AD=90=E8=A1=A8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerreturnRequestMainController.java | 24 +++++++++++++++++++ ...ustomerreturnRequestDetailExportReqVO.java | 3 +++ .../vo/CustomerreturnRequestMainRespVO.java | 5 ++++ .../CustomerreturnRequestDetailMapper.java | 1 + 4 files changed, 33 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java index 1fdaad55..9a09a7ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java +++ b/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 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 list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(reqVO); + List vos = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java index 6237b5d4..b0289919 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java index 92aff4fe..83931e62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java index 1142b905..c6b9fa7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java +++ b/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 selectList(CustomerreturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(CustomerreturnRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CustomerreturnRequestDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(CustomerreturnRequestDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(CustomerreturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())