From a757c2288fcc87d3b4090b69e427c9d1f89ca294 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 15:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferreceiptJobMainController.java | 24 +++++++++++++++++++ .../TransferreceiptJobDetailExportReqVO.java | 5 +++- .../vo/TransferreceiptJobMainRespVO.java | 5 ++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index ecb65d91..ebfa6558 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.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.transferreceiptJob.vo.*; +import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; +import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -34,6 +37,9 @@ public class TransferreceiptJobMainController { @Resource private TransferreceiptJobMainService transferreceiptJobMainService; + @Resource + private TransferreceiptJobDetailService transferreceiptJobDetailService; + @Resource private AdminUserApi userApi; @@ -118,4 +124,22 @@ public class TransferreceiptJobMainController { ExcelUtils.write(response, "调拨入库任务主.xls", "数据", TransferreceiptJobMainExcelVO.class, datas); } + @GetMapping("/getTransferreceiptJobById") + @Operation(summary = "APP获得调拨入库主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:query')") + public CommonResult getTransferreceiptJobById(@RequestParam("id") Long id) { + TransferreceiptJobMainDO transferreceiptJobMain = transferreceiptJobMainService.getTransferreceiptJobMain(id); + TransferreceiptJobMainRespVO result = TransferreceiptJobMainConvert.INSTANCE.convert(transferreceiptJobMain); + if(result==null) { + return success(result); + }; + TransferreceiptJobDetailExportReqVO exportReqVO = new TransferreceiptJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List transferreceiptJobDetailList = transferreceiptJobDetailService.getTransferreceiptJobDetailList(exportReqVO); + List transferreceiptJobDetailExcelVOS = TransferreceiptJobDetailConvert.INSTANCE.convertList02(transferreceiptJobDetailList); + result.setSubList(transferreceiptJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java index 7b936e42..2ad61ee5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java @@ -46,7 +46,7 @@ public class TransferreceiptJobDetailExportReqVO { private String itemDesc2; @Schema(description = "项目代码") - private String projectCode; + private Long projectCode; @Schema(description = "数量") private BigDecimal qty; @@ -73,4 +73,7 @@ public class TransferreceiptJobDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java index 69707fd7..94bdce9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.transferreceiptJob.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 TransferreceiptJobMainRespVO extends TransferreceiptJobMainBaseVO { + @Schema(description = "调拨入库任务子表job_transferreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + }