From 53f0ea36115a936be3fd14145692c68e5393b6da Mon Sep 17 00:00:00 2001 From: Yangk Date: Tue, 17 Mar 2026 09:09:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa/erp):=20=E6=96=B0=E5=A2=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=87=87=E8=B4=AD=E5=8D=95=E6=98=8E=E7=BB=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 exportSingle 接口用于导出单项项目采购单明细 - 在 ErpProjectPurchaseMaterialVo 中增加项目号和项目名称字段 - 移除不必要的 ExcelProperty 注解以优化导出格式 - 添加关联物料编号和销售物料名称的 Excel 导出支持 --- .../ErpProjectPurchaseController.java | 18 ++++++++++++ .../vo/ErpProjectPurchaseMaterialVo.java | 28 ++++++++++++++----- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java index cb847201..7f15eaa6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java @@ -58,6 +58,24 @@ public class ErpProjectPurchaseController extends BaseController { ExcelUtil.exportExcel(list, "项目采购信息", ErpProjectPurchaseVo.class, response); } + /** + * 导出单项项目采购单明细 + */ + @SaCheckPermission("oa/erp:projectPurchase:export") + @Log(title = "项目采购单明细", businessType = BusinessType.EXPORT) + @PostMapping("/exportSingle/{projectPurchaseId}") + public void exportSingle(@PathVariable("projectPurchaseId") Long projectPurchaseId, HttpServletResponse response) { + ErpProjectPurchaseVo detail = erpProjectPurchaseService.queryById(projectPurchaseId); + List list = detail.getPurchaseMaterialList(); + if (list != null) { + for (ErpProjectPurchaseMaterialVo material : list) { + material.setProjectCode(detail.getProjectCode()); + material.setProjectName(detail.getProjectName()); + } + } + ExcelUtil.exportExcel(list, "项目采购单明细", ErpProjectPurchaseMaterialVo.class, response); + } + /** * 获取项目采购信息详细信息 * diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java index 79cce41d..ad901f70 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java @@ -31,22 +31,34 @@ public class ErpProjectPurchaseMaterialVo implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 项目号 + */ + @ExcelProperty(value = "项目号") + private String projectCode; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + /** * 项目采购ID */ - @ExcelProperty(value = "项目采购ID") +// @ExcelProperty(value = "项目采购ID") private Long purchaseMaterialId; /** * 项目采购ID */ - @ExcelProperty(value = "项目采购ID") +// @ExcelProperty(value = "项目采购ID") private Long projectPurchaseId; /** * 关联明细ID */ - @ExcelProperty(value = "关联明细ID") +// @ExcelProperty(value = "关联明细ID") private Long relationDetailsId; /** @@ -73,13 +85,13 @@ public class ErpProjectPurchaseMaterialVo implements Serializable { /** * 物料ID */ - @ExcelProperty(value = "物料ID") +// @ExcelProperty(value = "物料ID") private Long materialId; /** * 销售物料ID */ - @ExcelProperty(value = "销售物料ID") +// @ExcelProperty(value = "销售物料ID") private Long relationMaterialId; /** @@ -103,7 +115,7 @@ public class ErpProjectPurchaseMaterialVo implements Serializable { /** * 单位ID */ - @ExcelProperty(value = "单位ID") +// @ExcelProperty(value = "单位ID") private Long unitId; /** @@ -127,7 +139,7 @@ public class ErpProjectPurchaseMaterialVo implements Serializable { /** * 序号 */ - @ExcelProperty(value = "序号") +// @ExcelProperty(value = "序号") private Long serialNumber; /** @@ -146,11 +158,13 @@ public class ErpProjectPurchaseMaterialVo implements Serializable { /** * 关联物料编号 */ + @ExcelProperty(value = "关联物料编号") private String relationMaterialCode; /** * 关联物料名称 */ + @ExcelProperty(value = "销售物料名称") private String relationMaterialName; /**