From 8fc8c0ddbb658c78665ebf91cc17583e1acf4ce8 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 9 Nov 2023 11:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=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 --- .../PurchasereturnRequestMainController.java | 24 +++++++++++++++++++ ...urchasereturnRequestDetailExportReqVO.java | 3 +++ .../vo/PurchasereturnRequestMainRespVO.java | 4 ++++ .../PurchasereturnRequestDetailMapper.java | 1 + 4 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index a24256fb..d19ff509 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/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 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 list = purchasereturnRequestDetailService.getPurchasereturnRequestDetailList(reqVO); + List vos = PurchasereturnRequestDetailConvert.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/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java index 5b86210d..98a5d766 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java index b41fecff..b86663db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java index 5d3f1f99..ff15e106 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java +++ b/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 selectList(PurchasereturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PurchasereturnRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(PurchasereturnRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(PurchasereturnRequestDetailDO::getBatch, reqVO.getBatch())