From b4113515fe0b37c5cda4f4fbd86f23b88cf3006e Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 15 Nov 2023 16:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E8=AF=A6=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectRequestMainController.java | 31 +++++++++++++++++++ .../vo/InspectRequestDetailExportReqVO.java | 3 ++ .../vo/InspectRequestMainRespVO.java | 5 +++ .../InspectRequestDetailMapper.java | 1 + 4 files changed, 40 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index e0541a86..50d454b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -4,6 +4,16 @@ 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.inspectRequest.vo.*; +import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExcelVO; +import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO; +import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainRespVO; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; +import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; +import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; +import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; +import com.win.module.wms.service.inspectRequest.InspectRequestDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +48,9 @@ public class InspectRequestMainController { @Resource private InspectRequestMainService inspectRequestMainService; + + @Resource + private InspectRequestDetailService inspectRequestDetailService; @Resource private AdminUserApi userApi; @@ -120,4 +133,22 @@ public class InspectRequestMainController { ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas); } + @GetMapping("/getInspectRequestById") + @Operation(summary = "APP获得检验申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')") + public CommonResult getInspectRequestById(@RequestParam("id") Long id) { + InspectRequestMainDO inspectRequestMain = inspectRequestMainService.getInspectRequestMain(id); + InspectRequestMainRespVO result = InspectRequestMainConvert.INSTANCE.convert(inspectRequestMain); + if(result==null) { + return success(result); + }; + InspectRequestDetailExportReqVO reqVO = new InspectRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = inspectRequestDetailService.getInspectRequestDetailList(reqVO); + List vos = InspectRequestDetailConvert.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/inspectRequest/vo/InspectRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java index 1a1263ed..45aa1f65 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java @@ -55,4 +55,7 @@ public class InspectRequestDetailExportReqVO { @Schema(description = "计量单位") private String uom; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java index eebd52cb..763392c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.inspectRequest.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 InspectRequestMainRespVO extends InspectRequestMainBaseVO { + @Schema(description = "检验申请子表request_inspect_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/inspectRequest/InspectRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java index 5c0c97a3..d203e72c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java @@ -44,6 +44,7 @@ public interface InspectRequestDetailMapper extends BaseMapperX selectList(InspectRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InspectRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InspectRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(InspectRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())