From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序,还要根据工艺路线的工序的顺序进行排序,开始的排在前面

---
 src/main/java/com/ruoyi/account/service/AccountIncomeService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
index 8c128a8..1004f28 100644
--- a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
@@ -3,11 +3,13 @@
 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.AccountDto2;
 import com.ruoyi.account.dto.AccountDto3;
-import com.ruoyi.account.pojo.AccountFile;
+import com.ruoyi.account.dto.ReportDateDto;
 import com.ruoyi.account.pojo.AccountIncome;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 public interface AccountIncomeService extends IService<AccountIncome> {
 
@@ -16,5 +18,9 @@
 
     void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);
 
-    AccountDto3 reportIncome();
+    List<AccountDto3> reportIncome(ReportDateDto reportDateDto);
+
+    AccountIncome getByInvoiceNumber(String purchaseContractNumber);
+
+    List<AccountIncome> getByInvoiceNumberList(String purchaseContractNumber);
 }

--
Gitblit v1.9.3