From 8efbf9a0fcdc0491d2d6fdd669369f5634f600bc Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=91=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 --- .../ProductionreceiptJobMainController.java | 24 +++++++++++++++++++ ...ProductionreceiptJobDetailExportReqVO.java | 3 +++ .../vo/ProductionreceiptJobMainRespVO.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/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index ce9434fb..76da0fe2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.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.productionreceiptJob.vo.*; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductionreceiptJobMainController { @Resource private ProductionreceiptJobMainService productionreceiptJobMainService; + @Resource + private ProductionreceiptJobDetailService productionreceiptJobDetailService; + @Resource private AdminUserApi userApi; @PostMapping("/create") @@ -120,4 +126,22 @@ public class ProductionreceiptJobMainController { return success(result); } + @GetMapping("/gettProductionreceiptJobById") + @Operation(summary = "APP获得生产发料主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')") + public CommonResult gettProductionreceiptJobById(@RequestParam("id") Long id) { + ProductionreceiptJobMainDO productionreceiptJobMain = productionreceiptJobMainService.getProductionreceiptJobMain(id); + ProductionreceiptJobMainRespVO result = ProductionreceiptJobMainConvert.INSTANCE.convert(productionreceiptJobMain); + if(result==null) { + return success(result); + }; + ProductionreceiptJobDetailExportReqVO productionreceiptJobDetailExportReqVO = new ProductionreceiptJobDetailExportReqVO(); + productionreceiptJobDetailExportReqVO.setMasterId(result.getId()); + List productionreceiptJobDetailList = productionreceiptJobDetailService.getProductionreceiptJobDetailList(productionreceiptJobDetailExportReqVO); + List productionreceiptJobDetailExcelVOS = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(productionreceiptJobDetailList); + result.setSubList(productionreceiptJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java index d61ce7aa..e16c486e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java @@ -82,4 +82,7 @@ public class ProductionreceiptJobDetailExportReqVO { @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/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java index 91a1ea69..a7fa9a43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreceiptJob.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 ProductionreceiptJobMainRespVO extends ProductionreceiptJobMainBaseVO { + @Schema(description = "生产发料子表job_productionreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + }