From 8c352f15c78d7479e814bba5d3acd5b7513261ef Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 08:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E4=B8=BB=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E8=AF=A6=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 --- .../UnplannedissueRequestMainController.java | 24 +++++++++++++++++++ ...nplannedissueRequestDetailExportReqVO.java | 3 +++ .../vo/UnplannedissueRequestMainRespVO.java | 5 ++++ .../UnplannedissueRequestDetailMapper.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/unplannedissueRequest/UnplannedissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java index 89088728..dcb3d93f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.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.unplannedissueRequest.vo.*; +import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestDetailConvert; +import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO; +import com.win.module.wms.service.unplannedissueRequest.UnplannedissueRequestDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +41,9 @@ public class UnplannedissueRequestMainController { @Resource private UnplannedissueRequestMainService unplannedissueRequestMainService; + @Resource + private UnplannedissueRequestDetailService unplannedissueRequestDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +128,22 @@ public class UnplannedissueRequestMainController { ExcelUtils.write(response, "计划外出库申请主.xls", "数据", UnplannedissueRequestMainExcelVO.class, datas); } + @GetMapping("/getUnplannedissueRequestById") + @Operation(summary = "APP获得计划外出库申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") + public CommonResult getUnplannedissueRequestById(@RequestParam("id") Long id) { + UnplannedissueRequestMainDO unplannedissueRequestMain = unplannedissueRequestMainService.getUnplannedissueRequestMain(id); + UnplannedissueRequestMainRespVO result = UnplannedissueRequestMainConvert.INSTANCE.convert(unplannedissueRequestMain); + if(result==null) { + return success(result); + }; + UnplannedissueRequestDetailExportReqVO reqVO = new UnplannedissueRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(reqVO); + List vos = UnplannedissueRequestDetailConvert.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/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java index 0362bfc3..aa276418 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java @@ -77,4 +77,7 @@ public class UnplannedissueRequestDetailExportReqVO { @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/unplannedissueRequest/vo/UnplannedissueRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainRespVO.java index 72c0649b..13dd8ad9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.unplannedissueRequest.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 UnplannedissueRequestMainRespVO extends UnplannedissueRequestMainBaseVO { + @Schema(description = "计划外出库库申请子表request_unplannedissue_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/unplannedissueRequest/UnplannedissueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java index a9c79547..9a8d4186 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java @@ -51,6 +51,7 @@ public interface UnplannedissueRequestDetailMapper extends BaseMapperX selectList(UnplannedissueRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(UnplannedissueRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(UnplannedissueRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(UnplannedissueRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(UnplannedissueRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())