From bac8d37d273205f560727622650138e6f4dc9289 Mon Sep 17 00:00:00 2001
From: songguoqiang <Song123456@>
Date: Tue, 7 Nov 2023 18:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueJob/IssueJobMainController.java      | 23 +++++++++++++++++++
 .../vo/IssueJobDetailExportReqVO.java         |  3 +++
 .../issueJob/vo/IssueJobMainRespVO.java       |  4 ++++
 3 files changed, 30 insertions(+)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
index dc32f486..af7cb02d 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
@@ -3,6 +3,9 @@ package com.win.module.wms.controller.issueJob;
 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.issueJob.IssueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
+import com.win.module.wms.service.issueJob.IssueJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,8 @@ public class IssueJobMainController {
 
     @Resource
     private IssueJobMainService issueJobMainService;
+    @Resource
+    private IssueJobDetailService issueJobDetailService;
 
     @Resource
     private AdminUserApi userApi;
@@ -122,4 +127,22 @@ public class IssueJobMainController {
         ExcelUtils.write(response, "发料任务主.xls", "数据", IssueJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getIssueJobById")
+    @Operation(summary = "APP获得发料任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:issue-job-main:query')")
+    public CommonResult<IssueJobMainRespVO> getIssueJobById(@RequestParam("id") Long id) {
+        IssueJobMainDO issueJobMain = issueJobMainService.getIssueJobMain(id);
+        IssueJobMainRespVO result = IssueJobMainConvert.INSTANCE.convert(issueJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        IssueJobDetailExportReqVO issueJobDetailExportReqVO = new IssueJobDetailExportReqVO();
+        issueJobDetailExportReqVO.setMasterId(result.getId());
+        List<IssueJobDetailDO> issueJobDetailList = issueJobDetailService.getIssueJobDetailList(issueJobDetailExportReqVO);
+        List<IssueJobDetailExcelVO> issueJobDetailExcelVOS = IssueJobDetailConvert.INSTANCE.convertList02(issueJobDetailList);
+        result.setSubList(issueJobDetailExcelVOS);
+        return success(result);
+    }
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java
index 3d45f04a..c034b021 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java
@@ -94,4 +94,7 @@ public class IssueJobDetailExportReqVO {
     @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/issueJob/vo/IssueJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java
index d4b18c7f..e836a99c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java
@@ -3,10 +3,14 @@ package com.win.module.wms.controller.issueJob.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 IssueJobMainRespVO extends IssueJobMainBaseVO {
 
+    @Schema(description = "发料任务子表job_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }