From 7574c6e74cb1a02d405a3fbdb2da289429540949 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 08:38:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=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 --- .../ScrapRequestMainController.java | 27 +++++++++++++++++++ .../vo/ScrapRequestDetailExportReqVO.java | 3 +++ .../vo/ScrapRequestMainRespVO.java | 4 +++ .../ScrapRequestDetailMapper.java | 1 + 4 files changed, 35 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java index 0dd7ddd4..9b7b8004 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.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.scrapRequest.vo.*; +import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; +import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; +import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -21,6 +24,7 @@ import static com.win.framework.common.pojo.CommonResult.success; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert; import com.win.module.wms.service.scrapRequest.ScrapRequestMainService; @@ -34,9 +38,13 @@ public class ScrapRequestMainController { @Resource private ScrapRequestMainService scrapRequestMainService; + @Resource + private ScrapRequestDetailService scrapRequestDetailService; + @Resource private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库申请主") @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:create')") @@ -114,4 +122,23 @@ public class ScrapRequestMainController { ExcelUtils.write(response, "报废出库申请主.xls", "数据", ScrapRequestMainExcelVO.class, datas); } + @GetMapping("/getScrapRequestById") + @Operation(summary = "APP获得报废出库申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')") + public CommonResult getScrapRequestById(@RequestParam("id") Long id) { + + ScrapRequestMainDO scrapRequestMain = scrapRequestMainService.getScrapRequestMain(id); + ScrapRequestMainRespVO result = ScrapRequestMainConvert.INSTANCE.convert(scrapRequestMain); + if(result==null) { + return success(result); + }; + ScrapRequestDetailExportReqVO reqVO = new ScrapRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = scrapRequestDetailService.getScrapRequestDetailList(reqVO); + List vos = ScrapRequestDetailConvert.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/scrapRequest/vo/ScrapRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java index 6f1a6d39..2e8fda99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java @@ -77,4 +77,7 @@ public class ScrapRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainRespVO.java index bb17bc96..12cce899 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.scrapRequest.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 ScrapRequestMainRespVO extends ScrapRequestMainBaseVO { + @Schema(description = "报废出库申请子表request_scrap_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/scrapRequest/ScrapRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java index 51af448e..f3ef4cc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java @@ -50,6 +50,7 @@ public interface ScrapRequestDetailMapper extends BaseMapperX selectList(ScrapRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(ScrapRequestDetailDO::getMasterid, reqVO.getMasterId()) .eqIfPresent(ScrapRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(ScrapRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(ScrapRequestDetailDO::getBatch, reqVO.getBatch())