From 09acd3a9f8b88489d36df1802be7828a17aba152 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 15:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E6=95=B4=E7=90=86createtim?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnplannedissueJobMainController.java | 24 +++++++++++++++++++ .../UnplannedissueJobDetailExportReqVO.java | 3 +++ .../vo/UnplannedissueJobMainRespVO.java | 5 ++++ .../UnplannedreceiptJobMainController.java | 24 +++++++++++++++++++ .../UnplannedreceiptJobDetailExportReqVO.java | 3 +++ .../vo/UnplannedreceiptJobMainRespVO.java | 4 ++++ 6 files changed, 63 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java index 20d5d4a0..4e68e69f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.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.unplannedissueJob.vo.*; +import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert; +import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO; +import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -40,6 +43,9 @@ public class UnplannedissueJobMainController { @Resource private UnplannedissueJobMainService unplannedissueJobMainService; + @Resource + private UnplannedissueJobDetailService unplannedissueJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +128,22 @@ public class UnplannedissueJobMainController { ExcelUtils.write(response, "计划外出库任务主.xls", "数据", UnplannedissueJobMainExcelVO.class, datas); } + @GetMapping("/getUnplannedissueJobById") + @Operation(summary = "APP获得计划外出库任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-job-main:query')") + public CommonResult getUnplannedissueJobById(@RequestParam("id") Long id) { + UnplannedissueJobMainDO unplannedissueJobMain = unplannedissueJobMainService.getUnplannedissueJobMain(id); + UnplannedissueJobMainRespVO result = UnplannedissueJobMainConvert.INSTANCE.convert(unplannedissueJobMain); + if(result==null) { + return success(result); + }; + UnplannedissueJobDetailExportReqVO reqVO = new UnplannedissueJobDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = unplannedissueJobDetailService.getUnplannedissueJobDetailList(reqVO); + List vos = UnplannedissueJobDetailConvert.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/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java index e302f232..c71b953d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java @@ -70,4 +70,7 @@ public class UnplannedissueJobDetailExportReqVO { @Schema(description = "创建者Id") private String creator; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java index bad08b41..98c8bead 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.unplannedissueJob.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 UnplannedissueJobMainRespVO extends UnplannedissueJobMainBaseVO { + @Schema(description = "计划外出库任务子表job_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/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java index 7b80092a..d300e204 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java @@ -3,6 +3,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.unplannedreceiptJob.vo.*; +import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO; +import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -33,6 +36,9 @@ public class UnplannedreceiptJobMainController { @Resource private UnplannedreceiptJobMainService unplannedreceiptJobMainService; + @Resource + private UnplannedreceiptJobDetailService unplannedreceiptJobDetailService; + @Resource private AdminUserApi userApi; @@ -115,4 +121,22 @@ public class UnplannedreceiptJobMainController { ExcelUtils.write(response, "计划外入库任务主.xls", "数据", UnplannedreceiptJobMainExcelVO.class, datas); } + @GetMapping("/getUnplannedreceiptJobById") + @Operation(summary = "APP获得计划外入库任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')") + public CommonResult getUnplannedreceiptJobById(@RequestParam("id") Long id) { + UnplannedreceiptJobMainDO unplannedreceiptJobMain = unplannedreceiptJobMainService.getUnplannedreceiptJobMain(id); + UnplannedreceiptJobMainRespVO result = UnplannedreceiptJobMainConvert.INSTANCE.convert(unplannedreceiptJobMain); + if(result==null) { + return success(result); + }; + UnplannedreceiptJobDetailExportReqVO exportReqVO = new UnplannedreceiptJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List unplannedreceiptJobDetailList = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailList(exportReqVO); + List vos = UnplannedreceiptJobDetailConvert.INSTANCE.convertList02(unplannedreceiptJobDetailList); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java index 65f39048..87c8e06d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java @@ -85,4 +85,7 @@ public class UnplannedreceiptJobDetailExportReqVO { @Schema(description = "创建者Id") private String creator; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java index a4b3ff77..121b20c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.unplannedreceiptJob.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 UnplannedreceiptJobMainRespVO extends UnplannedreceiptJobMainBaseVO { + @Schema(description = "计划外入库任务主子表job_unplannedreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; }