From 7d29b0a3889c72ccafeb59198066776c3902ee06 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 26 Oct 2023 10:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AD=90=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=B0=E4=B8=BB=E8=A1=A8=E8=8E=B7=E5=8F=96=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseclaimRequestDetailController.java | 41 ------------------- .../PurchaseclaimRequestMainController.java | 11 ++++- .../vo/PurchaseclaimRequestMainRespVO.java | 5 +++ 3 files changed, 15 insertions(+), 42 deletions(-) delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java deleted file mode 100644 index a164cf8b..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.win.module.wms.controller.purchaseclaimRequest; - -import com.win.framework.common.pojo.CommonResult; -import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO; -import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert; -import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO; -import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -import static com.win.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 采购索赔申请子") -@RestController -@RequestMapping("/wms/purchaseclaim-request-detail") -@Validated -public class PurchaseclaimRequestDetailController { - - @Resource - private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService; - - @GetMapping("/list") - @Operation(summary = "获得采购索赔申请子列表") - @Parameter(name = "masterId", description = "主表id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')") - public CommonResult> getPurchaseclaimRequestDetailList(@RequestParam("masterId") Long masterId) { - List list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(masterId); - return success(PurchaseclaimRequestDetailConvert.INSTANCE.convertList(list)); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java index 7f1dddc1..866fec6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java @@ -8,8 +8,11 @@ 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.purchaseclaimRequest.vo.*; +import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert; import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO; import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; +import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService; import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class PurchaseclaimRequestMainController { @Resource private PurchaseclaimRequestMainService purchaseclaimRequestMainService; + @Resource + private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService; + @Resource private AdminUserApi userApi; @@ -70,7 +76,10 @@ public class PurchaseclaimRequestMainController { @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')") public CommonResult getPurchaseclaimRequestMain(@RequestParam("id") Long id) { PurchaseclaimRequestMainDO purchaseclaimRequestMain = purchaseclaimRequestMainService.getPurchaseclaimRequestMain(id); - return success(PurchaseclaimRequestMainConvert.INSTANCE.convert(purchaseclaimRequestMain)); + PurchaseclaimRequestMainRespVO vo = PurchaseclaimRequestMainConvert.INSTANCE.convert(purchaseclaimRequestMain); + List subList = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(vo.getId()); + vo.setSubList(PurchaseclaimRequestDetailConvert.INSTANCE.convertList(subList)); + return success(vo); } @GetMapping("/list") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java index aef5b2a7..a892f902 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java @@ -5,10 +5,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.List; + @Schema(description = "管理后台 - 采购索赔申请主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchaseclaimRequestMainRespVO extends PurchaseclaimRequestMainBaseVO { + @Schema(description = "子表数据") + private List subList; + }