From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA

---
 src/main/java/com/ruoyi/basic/service/ISupplierService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index d9dd829..ce6d832 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -5,8 +5,11 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.basic.dto.SupplierManageDto;
 import com.ruoyi.basic.pojo.SupplierManage;
+import com.ruoyi.purchase.vo.SupplierTransactionsDetailsVo;
+import com.ruoyi.purchase.vo.SupplierTransactionsVo;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface ISupplierService extends IService<SupplierManage> {
@@ -53,4 +56,22 @@
      * @param supplierManageDto
      */
     void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);
+
+    Boolean importData(MultipartFile file);
+
+    /**
+     * 渚涘簲鍟嗗線鏉�
+     * @param page
+     * @param supplierName
+     * @return
+     */
+    IPage<SupplierTransactionsVo> supplierTransactions(Page page, String supplierName);
+
+    /**
+     * 渚涘簲鍟嗗線鏉ヨ鎯�
+     * @param page
+     * @param supplierId
+     * @return
+     */
+    IPage<SupplierTransactionsDetailsVo> supplierTransactionsDetails(Page page, Long supplierId);
 }

--
Gitblit v1.9.3