From 25a40b9c4e6a1b650610b8b13088d486699532ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:21 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复校验;修复考勤异常申请字段不匹配

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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..cf04753 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
@@ -3,6 +3,9 @@
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 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.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSubmitBatchRespVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
 import jakarta.validation.Valid;
@@ -23,6 +26,14 @@
      * @return 缂栧彿
      */
     Long createPurchaseRequest(@Valid ErpPurchaseRequestSaveReqVO createReqVO);
+
+    /**
+     * 瀵煎叆閲囪喘鐢宠
+     *
+     * @param importList 瀵煎叆鏁版嵁锛堟瘡涓�琛� = 涓�鏉℃槑缁嗭紝鐩稿悓閲囪喘鐢宠鍗曞彿鍚堝苟涓轰竴寮犵敵璇凤級
+     * @return 瀵煎叆缁撴灉
+     */
+    ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importList);
 
     /**
      * 鏇存柊閲囪喘鐢宠
@@ -80,6 +91,19 @@
     void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId);
 
     /**
+     * 鎵归噺鎻愪氦閲囪喘鐢宠瀹℃壒
+     *
+     * 閫愬崟鎻愪氦锛屽崟寮犲け璐ヤ笉褰卞搷鍏跺畠鐢宠锛涙瘡寮犵敵璇风嫭绔嬩簨鍔°��
+     *
+     * @param ids                  閲囪喘鐢宠缂栧彿鏁扮粍
+     * @param processDefinitionKey 娴佺▼瀹氫箟 Key
+     * @param userId               鐢ㄦ埛缂栧彿
+     * @return 鎵归噺鎻愪氦缁撴灉锛堟垚鍔熺紪鍙� + 澶辫触鍘熷洜锛�
+     */
+    ErpPurchaseRequestSubmitBatchRespVO submitPurchaseRequestBatch(List<Long> ids, String processDefinitionKey,
+                                                                   Long userId);
+
+    /**
      * 鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃
      *
      * @return 娴佺▼瀹氫箟鍒楄〃
@@ -104,6 +128,13 @@
     Long generatePurchaseOrder(Long id, Long supplierId);
 
     /**
+     * 閲嶇疆閲囪喘鐢宠鐘舵�侊紙椹冲洖 鈫� 鑽夌锛�
+     *
+     * @param id 缂栧彿
+     */
+    void resetPurchaseRequestStatus(Long id);
+
+    /**
      * 鏍规嵁缂栧彿鍒楄〃鑾峰彇閲囪喘鐢宠鍒楄〃
      *
      * @param ids 缂栧彿鍒楄〃

--
Gitblit v1.9.3