From 07a08efc3bd17142a81c2128be99abb34c498577 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 二月 2026 10:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
index 257f903..5512cd6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
@@ -5,13 +5,13 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.export.PlatformLedgerReportExport;
import com.ruoyi.system.export.ProcurementReportClinicExport;
+import com.ruoyi.system.export.ProcurementReportDetailExport;
import com.ruoyi.system.export.ProcurementReportPlatformExport;
import com.ruoyi.system.export.ProcurementReportSupplierExport;
import com.ruoyi.system.model.TErpProcurement;
import com.ruoyi.system.model.TErpProcurementGoods;
import com.ruoyi.system.query.ClinicProcurementReportQuery;
import com.ruoyi.system.query.PerformanceReportQuery;
-import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.vo.*;
import org.apache.ibatis.annotations.Param;
@@ -164,4 +164,20 @@
* @return
*/
List<SalespersonPerformanceReportVO> exportSalespersonPerformanceReport(@Param("query")PerformanceReportQuery query);
+
+ /**
+ * 诊所采购报表详情列表（商品维度）
+ *
+ * @param id 查询参数（包含采购单ID）
+ * @return
+ */
+ List<ClinicProcurementReportDetailVO> clinicProcurementReportDetail(@Param("id") String id);
+
+ /**
+ * 诊所采购报表详情导出（商品维度）
+ *
+ * @param procurementIds 查询参数（包含采购单ID列表，支持多选）
+ * @return
+ */
+ List<ProcurementReportDetailExport> exportProcurementReportDetail(@Param("procurementIds") List<String> procurementIds);
}
--
Gitblit v1.7.1