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/purchase/ErpPurchaseRequestService.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
index a761923..5254d6c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
@@ -1,6 +1,9 @@
package cn.iocoder.yudao.module.erp.service.purchase;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
@@ -9,7 +12,7 @@
import java.util.Collection;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* ERP 閲囪喘鐢宠 Service 鎺ュ彛
@@ -73,26 +76,42 @@
/**
* 鎻愪氦閲囪喘鐢宠瀹℃壒
*
- * @param id 缂栧彿
- * @param processDefinitionKey 娴佺▼瀹氫箟 Key
- * @param userId 鐢ㄦ埛缂栧彿
- */
- void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId);
-
- /**
- * 鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃
- *
- * @return 娴佺▼瀹氫箟鍒楄〃
- */
- List<Map<String, Object>> getPurchaseRequestApproveProcessDefinitionList();
-
- /**
- * 鏇存柊閲囪喘鐢宠瀹℃壒缁撴灉锛圔PM 鍥炶皟锛�
+ * 浠呫�愭湭鎻愪氦銆戞垨銆愬鏍镐笉閫氳繃銆戠姸鎬佸彲鎻愪氦锛涘鎵逛汉鐢便�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�鎸囧畾锛�
+ * 鎻愪氦鍚庤繘鍏ャ�愬鎵逛腑銆戯紝骞舵竻绌轰笂涓�杞鏍哥粨鏋溿��
*
* @param id 缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
*/
- void updatePurchaseRequestAuditStatus(Long id, Integer bpmResult);
+ void submitPurchaseRequest(Long id);
+
+ /**
+ * 鑾峰彇閲囪喘鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛堟垨绛撅細浠讳竴浜哄鏍稿嵆鍙級
+ *
+ * @return 瀹℃壒浜虹敤鎴风紪鍙�
+ */
+ Set<Long> getPurchaseRequestApproverUserIds();
+
+ /**
+ * 瀹℃牳閲囪喘鐢宠锛堥�氳繃 / 涓嶉�氳繃锛�
+ *
+ * 浠呴厤缃唴鐨勫鎵逛汉鍙墽琛岋紱瀹℃牳涓嶉�氳繃鏃跺繀椤诲～鍐欏師鍥狅紝閫�鍥炲悗鍙慨鏀瑰苟閲嶆柊鎻愪氦銆�
+ *
+ * @param id 缂栧彿
+ * @param pass 鏄惁瀹℃牳閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚
+ */
+ void auditPurchaseRequest(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * BPM 瀹℃壒缁撴灉鍥炶皟鏇存柊閲囪喘鐢宠鐘舵��
+ *
+ * 鐢� BPM 娴佺▼瀹炰緥缁撴潫浜嬩欢瑙﹀彂锛屽皢瀹℃壒缁撴灉鍥炲啓涓轰笟鍔＄姸鎬侊細
+ * 瀹℃壒閫氳繃 鈫� 瀹℃牳閫氳繃锛堝苟鑷姩鐢熸垚閲囪喘璁㈠崟锛夛紱瀹℃壒涓嶉�氳繃 鈫� 瀹℃牳涓嶉�氳繃锛涙祦绋嬪彇娑� 鈫� 宸插彇娑堛��
+ *
+ * @param id 閲囪喘鐢宠缂栧彿
+ * @param bpmStatus BPM 瀹℃壒缁撴灉鐘舵��
+ * @param reason 瀹℃牳鎰忚锛圔PM 瀹℃壒鎰忚锛�
+ */
+ void updatePurchaseRequestAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 鐢熸垚閲囪喘璁㈠崟
@@ -111,4 +130,14 @@
*/
List<ErpPurchaseRequestDO> getPurchaseRequestList(List<Long> ids);
+ /**
+ * 瀵煎叆閲囪喘鐢宠
+ *
+ * @param importRequests 瀵煎叆鐨勯噰璐敵璇峰垪琛紙涓�琛屼竴鏉℃槑缁嗭級
+ * @param importReqVO 瀵煎叆鍙傛暟
+ * @return 瀵煎叆缁撴灉
+ */
+ ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importRequests,
+ ErpPurchaseRequestImportReqVO importReqVO);
+
}
\ No newline at end of file
--
Gitblit v1.9.3