From 707bfe513ec6643a691bbf5c30324c876e61af53 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=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 --- .../ProductionreturnJobMainController.java | 24 +++++++++++++++++++ .../ProductionreturnJobDetailExportReqVO.java | 3 +++ .../vo/ProductionreturnJobMainRespVO.java | 5 ++++ 3 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index c8018175..88ef73fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.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.productionreturnJob.vo.*; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductionreturnJobMainController { @Resource private ProductionreturnJobMainService productionreturnJobMainService; + @Resource + private ProductionreturnJobDetailService productionreturnJobDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class ProductionreturnJobMainController { return success(result); } + @GetMapping("/getProductionreturnJobById") + @Operation(summary = "APP获得生产退料主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')") + public CommonResult getProductionreturnJobById(@RequestParam("id") Long id) { + ProductionreturnJobMainDO productionreturnJobMain = productionreturnJobMainService.getProductionreturnJobMain(id); + ProductionreturnJobMainRespVO result = ProductionreturnJobMainConvert.INSTANCE.convert(productionreturnJobMain); + if(result==null) { + return success(result); + }; + ProductionreturnJobDetailExportReqVO productionreturnJobDetailExportReqVO = new ProductionreturnJobDetailExportReqVO(); + productionreturnJobDetailExportReqVO.setMasterId(result.getId()); + List productionreturnJobDetailList = productionreturnJobDetailService.getProductionreturnJobDetailList(productionreturnJobDetailExportReqVO); + List productionreturnJobDetailExcelVOS = ProductionreturnJobDetailConvert.INSTANCE.convertList02(productionreturnJobDetailList); + result.setSubList(productionreturnJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java index 4b9e9de6..b407c5e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java @@ -79,4 +79,7 @@ public class ProductionreturnJobDetailExportReqVO { @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/productionreturnJob/vo/ProductionreturnJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java index 986c4512..3611cdc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreturnJob.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 ProductionreturnJobMainRespVO extends ProductionreturnJobMainBaseVO { + @Schema(description = "生产退料子表job_productionreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + }