From 1b537e4a17604693712630965135f746643422fe Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 14:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductdismantleJobMainController.java | 24 +++++++++++++++++++ .../ProductdismantleJobDetailExportReqVO.java | 3 +++ .../vo/ProductdismantleJobMainRespVO.java | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java index 0fcb2706..71cc6253 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java @@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleJob.vo.*; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductdismantleJobMainController { @Resource private ProductdismantleJobMainService productdismantleJobMainService; + @Resource + private ProductdismantleJobDetailService productdismantleJobDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class ProductdismantleJobMainController { return success(result); } + @GetMapping("/getProductdismantleJobById") + @Operation(summary = "APP获得制品收货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')") + public CommonResult getProductdismantleJobById(@RequestParam("id") Long id) { + ProductdismantleJobMainDO productdismantleJobMain = productdismantleJobMainService.getProductdismantleJobMain(id); + ProductdismantleJobMainRespVO result = ProductdismantleJobMainConvert.INSTANCE.convert(productdismantleJobMain); + if(result==null) { + return success(result); + }; + ProductdismantleJobDetailExportReqVO exportReqVO = new ProductdismantleJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List productdismantleJobDetailList = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO); + List productdismantleJobDetailExcelVOS = ProductdismantleJobDetailConvert.INSTANCE.convertList02(productdismantleJobDetailList); + result.setSubList(productdismantleJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java index d53a5c47..47a59a0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java @@ -93,4 +93,7 @@ public class ProductdismantleJobDetailExportReqVO { @Schema(description = "从货主代码") private String fromOwnerCode; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java index a2bafa3d..2f02afc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.productdismantleJob.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 ProductdismantleJobMainRespVO extends ProductdismantleJobMainBaseVO { + @Schema(description = "制品拆解任务子表job_productdismantle_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; }