From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
index b2f2791..56f6e18 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
@@ -7,13 +7,16 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO;
import jakarta.validation.Valid;
+import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* ERP 浠樻鍗� Service 鎺ュ彛
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public interface ErpFinancePaymentService {
@@ -33,12 +36,44 @@
void updateFinancePayment(@Valid ErpFinancePaymentSaveReqVO updateReqVO);
/**
- * 鏇存柊浠樻鍗曠殑鐘舵��
+ * 鎻愪氦浠樻鍗曞鎵�
+ *
+ * 浠呫�愭湭瀹℃牳銆戯紙鍚鏍镐笉閫氳繃閫�鍥烇級鐘舵�佸彲鎻愪氦锛涘鎵逛汉鐢便�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�鎸囧畾锛�
+ * 鎻愪氦鍚庤繘鍏ャ�愬鎵逛腑銆戯紝骞舵竻绌轰笂涓�杞鏍哥粨鏋溿��
*
* @param id 缂栧彿
- * @param status 鐘舵��
*/
- void updateFinancePaymentStatus(Long id, Integer status);
+ void submitFinancePayment(Long id);
+
+ /**
+ * 鑾峰彇浠樻鍗曠殑瀹℃壒浜虹紪鍙烽泦鍚堬紙鎴栫锛氫换涓�浜哄鏍稿嵆鍙級
+ *
+ * @return 瀹℃壒浜虹敤鎴风紪鍙�
+ */
+ Set<Long> getFinancePaymentApproverUserIds();
+
+ /**
+ * 瀹℃牳浠樻鍗曪紙閫氳繃 / 涓嶉�氳繃锛�
+ *
+ * 浠呴厤缃唴鐨勫鎵逛汉鍙墽琛岋紱瀹℃牳涓嶉�氳繃鏃跺繀椤诲～鍐欏師鍥狅紝閫�鍥炲悗鍙慨鏀瑰苟閲嶆柊鎻愪氦銆�
+ *
+ * @param id 缂栧彿
+ * @param pass 鏄惁瀹℃牳閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚
+ */
+ void auditFinancePayment(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * BPM 瀹℃壒缁撴灉鍥炶皟鏇存柊浠樻鍗曠姸鎬�
+ *
+ * 鐢� BPM 娴佺▼瀹炰緥缁撴潫浜嬩欢瑙﹀彂锛屽皢瀹℃壒缁撴灉鍥炲啓涓轰笟鍔＄姸鎬侊細
+ * 瀹℃壒閫氳繃 鈫� 宸插鏍革紱瀹℃壒涓嶉�氳繃 / 娴佺▼鍙栨秷 鈫� 鏈鏍革紙閫�鍥炲悗鍙慨鏀瑰苟閲嶆柊鎻愪氦锛夈��
+ *
+ * @param id 浠樻鍗曠紪鍙�
+ * @param bpmStatus BPM 瀹℃壒缁撴灉鐘舵��
+ * @param reason 瀹℃牳鎰忚锛圔PM 瀹℃壒鎰忚锛�
+ */
+ void updateFinancePaymentAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 鍒犻櫎浠樻鍗�
@@ -63,6 +98,14 @@
*/
PageResult<ErpFinancePaymentDO> getFinancePaymentPage(ErpFinancePaymentPageReqVO pageReqVO);
+ /**
+ * 缁熻姣忓紶鏉ョエ宸蹭粯娆鹃噾棰濓紙鏈鏍� + 瀹℃壒涓� + 宸插鏍革紝鎺掗櫎浣滃簾锛�
+ *
+ * @param invoiceIds 鏉ョエ缂栧彿鍒楄〃
+ * @return key 涓烘潵绁ㄧ紪鍙凤紝value 涓哄凡浠樻閲戦
+ */
+ Map<Long, BigDecimal> getPaymentPriceMapByInvoiceId(Collection<Long> invoiceIds);
+
// ==================== 浠樻鍗曢」 ====================
/**
--
Gitblit v1.9.3