From df98ce0f4e26e70fe96dfa2389cc511e909398ce Mon Sep 17 00:00:00 2001
From: songguoqiang <Song123456@>
Date: Wed, 8 Nov 2023 14:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=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

---
 .../deliverJob/DeliverJobMainController.java  | 24 +++++++++++++++++++
 .../vo/DeliverJobDetailExportReqVO.java       |  5 ++++
 .../deliverJob/vo/DeliverJobMainRespVO.java   |  4 ++++
 3 files changed, 33 insertions(+)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java
index 1e313738..3e4c12db 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java
@@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverJob;
 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.deliverJob.DeliverJobDetailConvert;
+import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
+import com.win.module.wms.service.deliverJob.DeliverJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,9 @@ public class DeliverJobMainController {
 
     @Resource
     private DeliverJobMainService deliverJobMainService;
+    
+    @Resource
+    private DeliverJobDetailService deliverJobDetailService;
 
     @Resource
     private AdminUserApi userApi;
@@ -121,4 +127,22 @@ public class DeliverJobMainController {
         ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getDeliverJobById")
+    @Operation(summary = "APP获得发货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
+    public CommonResult<DeliverJobMainRespVO> getDeliverJobById(@RequestParam("id") Long id) {
+        DeliverJobMainDO deliverJobMain = deliverJobMainService.getDeliverJobMain(id);
+        DeliverJobMainRespVO result = DeliverJobMainConvert.INSTANCE.convert(deliverJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        DeliverJobDetailExportReqVO exportReqVO = new DeliverJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<DeliverJobDetailDO> deliverJobDetailList = deliverJobDetailService.getDeliverJobDetailList(exportReqVO);
+        List<DeliverJobDetailExcelVO> deliverJobDetailExcelVOS = DeliverJobDetailConvert.INSTANCE.convertList02(deliverJobDetailList);
+        result.setSubList(deliverJobDetailExcelVOS);
+        return success(result);
+    }
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java
index f5a3d2ee..c4fa15fd 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java
@@ -74,4 +74,9 @@ public class DeliverJobDetailExportReqVO {
     @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/deliverJob/vo/DeliverJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java
index 9dc1444d..25d1bd58 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java
@@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverJob.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 DeliverJobMainRespVO extends DeliverJobMainBaseVO {
 
+    @Schema(description = "发货任务子表job_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }