From 5d38e3b83d1c3d52665808bf9f54dd13afaf1560 Mon Sep 17 00:00:00 2001
From: songguoqiang <Song123456@>
Date: Wed, 8 Nov 2023 15:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=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=E4=BB=A5=E5=8F=8A=E6=95=B4=E7=90=86createtime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapJob/ScrapJobMainController.java      | 26 +++++++++++++++++--
 .../vo/ScrapJobDetailExportReqVO.java         |  3 +++
 .../scrapJob/vo/ScrapJobMainRespVO.java       |  4 +++
 3 files changed, 31 insertions(+), 2 deletions(-)

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<ScrapJobMainRespVO> 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<ScrapJobDetailDO> scrapJobDetailList = scrapJobDetailService.getScrapJobDetailList(reqVO);
+        List<ScrapJobDetailExcelVO> 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;
 }