From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10:07 +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/ErpPurchaseOrderService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
index 15f998b..a7b6fdd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
@@ -46,12 +46,20 @@
* 鎻愪氦閲囪喘璁㈠崟瀹℃壒
*
* @param id 缂栧彿
+ * @param processDefinitionKey 娴佺▼瀹氫箟 Key
* @param userId 鐢ㄦ埛缂栧彿
*/
- void submitPurchaseOrder(Long id, Long userId);
+ void submitPurchaseOrder(Long id, String processDefinitionKey, Long userId);
/**
- * 鏇存柊閲囪喘璁㈠崟鐨勫鎵圭姸鎬�
+ * 鑾峰彇閲囪喘璁㈠崟瀹℃壒娴佺▼鍒楄〃
+ *
+ * @return 娴佺▼瀹氫箟鍒楄〃
+ */
+ List<Map<String, Object>> getPurchaseOrderApproveProcessDefinitionList();
+
+ /**
+ * 鏇存柊閲囪喘璁㈠崟瀹℃壒缁撴灉锛圔PM 鍥炶皟锛�
*
* @param id 缂栧彿
* @param bpmResult BPM 瀹℃壒缁撴灉
@@ -123,4 +131,43 @@
*/
List<ErpPurchaseOrderItemDO> getPurchaseOrderItemListByOrderIds(Collection<Long> orderIds);
+ /**
+ * 鏍规嵁渚涘簲鍟嗙紪鍙峰拰鐘舵�佽幏鍙栭噰璐鍗曞垪琛�
+ *
+ * @param supplierId 渚涘簲鍟嗙紪鍙�
+ * @param status 鐘舵��
+ * @return 閲囪喘璁㈠崟鍒楄〃
+ */
+ List<ErpPurchaseOrderDO> getPurchaseOrderListBySupplierIdAndStatus(Long supplierId, Integer status);
+
+ /**
+ * 鏍规嵁缂栧彿鍒楄〃鑾峰彇閲囪喘璁㈠崟鍒楄〃
+ *
+ * @param ids 缂栧彿鍒楄〃
+ * @return 閲囪喘璁㈠崟鍒楄〃
+ */
+ List<ErpPurchaseOrderDO> getPurchaseOrderList(List<Long> ids);
+
+ /**
+ * 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
+ *
+ * 鏍规嵁鏄庣粏鍏ュ簱鏁伴噺鑷姩璁＄畻璁㈠崟鐘舵�侊細
+ * - 鎵�鏈夋槑缁嗛兘瀹屾垚鍏ュ簱 鈫� 鍏ㄩ儴鍏ュ簱鐘舵��
+ * - 閮ㄥ垎鏄庣粏瀹屾垚鍏ュ簱 鈫� 閮ㄥ垎鍏ュ簱鐘舵��
+ * - 鏃犳槑缁嗗叆搴� 鈫� 鏈叆搴撶姸鎬�
+ *
+ * @param orderId 璁㈠崟缂栧彿
+ */
+ void updatePurchaseOrderInStatus(Long orderId);
+
+ /**
+ * 纭鏀惰揣
+ *
+ * 鐢熸垚鍒拌揣閫氱煡鍗曪紝鐘舵�佷负寰呭叆搴�
+ *
+ * @param id 閲囪喘璁㈠崟缂栧彿
+ * @return 鍒拌揣閫氱煡鍗曠紪鍙�
+ */
+ Long confirmReceipt(Long id);
+
}
\ No newline at end of file
--
Gitblit v1.9.3