diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index de94ae76..d91669d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.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.transferissueJob.vo.*; +import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert; +import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; +import com.win.module.wms.service.transferissueJob.TransferissueJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -26,7 +29,6 @@ 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.controller.transferissueJob.vo.*; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert; import com.win.module.wms.service.transferissueJob.TransferissueJobMainService; @@ -40,6 +42,9 @@ public class TransferissueJobMainController { @Resource private TransferissueJobMainService transferissueJobMainService; + @Resource + private TransferissueJobDetailService transferissueJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +127,22 @@ public class TransferissueJobMainController { ExcelUtils.write(response, "调拨出库任务主.xls", "数据", TransferissueJobMainExcelVO.class, datas); } + @GetMapping("/getTransferissueJobById") + @Operation(summary = "APP获得调拨出库主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')") + public CommonResult getTransferissueJobById(@RequestParam("id") Long id) { + TransferissueJobMainDO transferissueJobMain = transferissueJobMainService.getTransferissueJobMain(id); + TransferissueJobMainRespVO result = TransferissueJobMainConvert.INSTANCE.convert(transferissueJobMain); + if(result==null) { + return success(result); + }; + TransferissueJobDetailExportReqVO exportReqVO = new TransferissueJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List transferissueJobDetailList = transferissueJobDetailService.getTransferissueJobDetailList(exportReqVO); + List transferissueJobDetailExcelVOS = TransferissueJobDetailConvert.INSTANCE.convertList02(transferissueJobDetailList); + result.setSubList(transferissueJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java index b2870e7b..13c7a884 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java @@ -73,4 +73,8 @@ public class TransferissueJobDetailExportReqVO { @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/transferissueJob/vo/TransferissueJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobMainRespVO.java index e2a38a8c..963e2188 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.transferissueJob.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 TransferissueJobMainRespVO extends TransferissueJobMainBaseVO { + @Schema(description = "调拨出库任务子表job_transferissue_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; }