From acaf0e69a594f36ef9be6749c2b8d66e4ef6123b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:54:33 +0800
Subject: [PATCH] feat: 发货审批根据合同号合并到第一条(未审批)的记录中
---
src/main/java/com/ruoyi/account/service/AccountExpenseService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
index a1f2677..07b129b 100644
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
@@ -3,12 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.account.dto.AccountDto;
+import com.ruoyi.account.bean.dto.AccountDto;
+import com.ruoyi.account.bean.dto.AccountDto3;
+import com.ruoyi.account.bean.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
public interface AccountExpenseService extends IService<AccountExpense> {
@@ -17,4 +20,12 @@
void accountExpenseExport(HttpServletResponse response, AccountExpense accountExpense);
AccountDto report(DateQueryDto dateQueryDto);
+
+ List<AccountDto3> reportExpense(ReportDateDto reportDateDto);
+
+ Map<String,List<String>> analysis();
+
+ AccountExpense getByInvoiceNumber(String purchaseContractNumber);
+
+ List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
}
--
Gitblit v1.9.3