diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java index 0fe032a3..2152ba1e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java @@ -1,9 +1,10 @@ package com.win.module.wms.controller.scrapJob; - 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.convert.scrapJob.ScrapJobDetailConvert; +import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO; +import com.win.module.wms.service.scrapJob.ScrapJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -40,6 +41,9 @@ public class ScrapJobMainController { @Resource private ScrapJobMainService scrapJobMainService; + @Resource + private ScrapJobDetailService scrapJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +126,22 @@ public class ScrapJobMainController { ExcelUtils.write(response, "报废出库任务主.xls", "数据", ScrapJobMainExcelVO.class, datas); } + @GetMapping("/getScrapJobById") + @Operation(summary = "APP获得报废出库任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:query')") + public CommonResult getScrapJobById(@RequestParam("id") Long id) { + ScrapJobMainDO scrapJobMain = scrapJobMainService.getScrapJobMain(id); + ScrapJobMainRespVO result = ScrapJobMainConvert.INSTANCE.convert(scrapJobMain); + if(result==null) { + return success(result); + }; + ScrapJobDetailExportReqVO reqVO = new ScrapJobDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List scrapJobDetailList = scrapJobDetailService.getScrapJobDetailList(reqVO); + List vos = ScrapJobDetailConvert.INSTANCE.convertList02(scrapJobDetailList); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java index 6aa630e8..46261165 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java @@ -70,4 +70,7 @@ public class ScrapJobDetailExportReqVO { @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/scrapJob/vo/ScrapJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainRespVO.java index 322e91b9..9cc0e869 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.scrapJob.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 ScrapJobMainRespVO extends ScrapJobMainBaseVO { + @Schema(description = "报废出库任务子表job_scrap_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; }