From d112a6f7db4cb97d40850a70b7d6041ffc31adc5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 五月 2025 11:35:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
index 71dd825..f159d89 100644
--- a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
-import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import org.springframework.web.multipart.MultipartFile;
@@ -18,7 +18,7 @@
* @param invoiceLedgerDto
* @return
*/
- int invoiceLedgerAdd( InvoiceLedgerDto invoiceLedgerDto);
+ int invoiceLedgerSaveOrUpdate( InvoiceLedgerDto invoiceLedgerDto);
/**
* 寮�绁ㄥ彴璐﹀垹闄�
@@ -26,13 +26,6 @@
* @return
*/
int invoiceLedgerDel(List<Integer> ids);
-
- /**
- * 寮�绁ㄥ彴璐︿慨鏀�
- * @param invoiceLedgerDto
- * @return
- */
- int invoiceLedgerUpdate(InvoiceLedgerDto invoiceLedgerDto);
/**
* 寮�绁ㄥ彴璐﹀垎椤垫煡璇�
@@ -62,5 +55,34 @@
* @param invoiceLedgerDto
* @return
*/
- void invoiceLedgerDownload(HttpServletResponse response ,InvoiceLedgerDto invoiceLedgerDto);
+ void invoiceLedgerExport(HttpServletResponse response ,InvoiceLedgerDto invoiceLedgerDto);
+
+ /**
+ * 寮�绁ㄥ彴璐﹁鎯�
+ * @param id
+ * @return
+ */
+ InvoiceLedgerDto invoiceLedgerDetail(Integer id);
+
+ /**
+ * 闄勪欢鎻愪氦
+ * @param invoiceLedgerDto
+ * @return
+ */
+ void invoiceLedgerCommitFile(InvoiceLedgerDto invoiceLedgerDto);
+
+ /**
+ * 寮�绁ㄥ彴璐︽煡璇�
+ * @param invoiceLedgerDto
+ * @return
+ */
+ List<InvoiceLedgerDto> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto);
+
+ /**
+ * 瀹㈡埛閿�鍞褰�
+ * @param page
+ * @param invoiceLedgerDto
+ * @return
+ */
+ IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);
}
--
Gitblit v1.9.3