From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java |   68 ++++++++++++++++------------------
 1 files changed, 32 insertions(+), 36 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 569f11c..a761923 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
@@ -9,11 +9,10 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * ERP 閲囪喘鐢宠 Service 鎺ュ彛
- *
- * @author 鑺嬮亾婧愮爜
  */
 public interface ErpPurchaseRequestService {
 
@@ -21,11 +20,9 @@
      * 鍒涘缓閲囪喘鐢宠
      *
      * @param createReqVO 鍒涘缓淇℃伅
-     * @param userId      鐢ㄦ埛缂栧彿锛堢敵璇蜂汉锛�
-     * @param deptId      閮ㄩ棬缂栧彿锛堢敵璇烽儴闂級
      * @return 缂栧彿
      */
-    Long createPurchaseRequest(@Valid ErpPurchaseRequestSaveReqVO createReqVO, Long userId, Long deptId);
+    Long createPurchaseRequest(@Valid ErpPurchaseRequestSaveReqVO createReqVO);
 
     /**
      * 鏇存柊閲囪喘鐢宠
@@ -58,61 +55,60 @@
     PageResult<ErpPurchaseRequestDO> getPurchaseRequestPage(ErpPurchaseRequestPageReqVO pageReqVO);
 
     /**
-     * 鑾峰緱閲囪喘鐢宠鏄庣粏鍒楄〃
+     * 鑾峰緱閲囪喘鐢宠椤瑰垪琛�
      *
      * @param requestId 閲囪喘鐢宠缂栧彿
-     * @return 閲囪喘鐢宠鏄庣粏鍒楄〃
+     * @return 閲囪喘鐢宠椤瑰垪琛�
      */
     List<ErpPurchaseRequestItemDO> getPurchaseRequestItemListByRequestId(Long requestId);
 
     /**
-     * 鑾峰緱閲囪喘鐢宠鏄庣粏鍒楄〃
+     * 鑾峰緱閲囪喘鐢宠椤� List
      *
      * @param requestIds 閲囪喘鐢宠缂栧彿鏁扮粍
-     * @return 閲囪喘鐢宠鏄庣粏鍒楄〃
+     * @return 閲囪喘鐢宠椤� List
      */
     List<ErpPurchaseRequestItemDO> getPurchaseRequestItemListByRequestIds(Collection<Long> requestIds);
 
     /**
      * 鎻愪氦閲囪喘鐢宠瀹℃壒
      *
-     * @param id                   缂栧彿
-     * @param processDefinitionKey 娴佺▼瀹氫箟 Key锛堢敤鎴烽�夋嫨锛�
-     * @param userId               鐢ㄦ埛缂栧彿
+     * @param id 缂栧彿
+     * @param processDefinitionKey 娴佺▼瀹氫箟 Key
+     * @param userId 鐢ㄦ埛缂栧彿
      */
     void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId);
-
-    /**
-     * 鏇存柊閲囪喘鐢宠瀹℃壒鐘舵��
-     *
-     * @param id        缂栧彿
-     * @param bpmResult BPM 瀹℃壒缁撴灉
-     */
-    void updatePurchaseRequestAuditStatus(Long id, Integer bpmResult);
-
-    /**
-     * 鏍规嵁閲囪喘鐢宠鐢熸垚閲囪喘璁㈠崟
-     *
-     * @param id         閲囪喘鐢宠缂栧彿
-     * @param supplierId 渚涘簲鍟嗙紪鍙�
-     * @param userId     鐢ㄦ埛缂栧彿
-     * @return 閲囪喘璁㈠崟缂栧彿
-     */
-    Long generatePurchaseOrder(Long id, Long supplierId, Long userId);
 
     /**
      * 鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃
      *
      * @return 娴佺▼瀹氫箟鍒楄〃
      */
-    List<java.util.Map<String, Object>> getPurchaseRequestApproveProcessDefinitionList();
+    List<Map<String, Object>> getPurchaseRequestApproveProcessDefinitionList();
 
     /**
-     * 鏇存柊閲囪喘鐢宠鐨勫叆搴撶姸鎬�
+     * 鏇存柊閲囪喘鐢宠瀹℃壒缁撴灉锛圔PM 鍥炶皟锛�
      *
-     * @param id       閲囪喘鐢宠缂栧彿
-     * @param inStatus 鍏ュ簱鐘舵��
+     * @param id 缂栧彿
+     * @param bpmResult BPM 瀹℃壒缁撴灉
      */
-    void updatePurchaseRequestInStatus(Long id, Integer inStatus);
+    void updatePurchaseRequestAuditStatus(Long id, Integer bpmResult);
 
-}
+    /**
+     * 鐢熸垚閲囪喘璁㈠崟
+     *
+     * @param id 閲囪喘鐢宠缂栧彿
+     * @param supplierId 渚涘簲鍟嗙紪鍙�
+     * @return 閲囪喘璁㈠崟缂栧彿
+     */
+    Long generatePurchaseOrder(Long id, Long supplierId);
+
+    /**
+     * 鏍规嵁缂栧彿鍒楄〃鑾峰彇閲囪喘鐢宠鍒楄〃
+     *
+     * @param ids 缂栧彿鍒楄〃
+     * @return 閲囪喘鐢宠鍒楄〃
+     */
+    List<ErpPurchaseRequestDO> getPurchaseRequestList(List<Long> ids);
+
+}
\ No newline at end of file

--
Gitblit v1.9.3