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/sale/ErpSaleOrderService.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
index 530faa9..862f461 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
@@ -43,20 +43,18 @@
void updateSaleOrderStatus(Long id, Integer status);
/**
- * 鎻愪氦閿�鍞鍗曞鎵�
+ * 浣滃簾閿�鍞鍗�
*
* @param id 缂栧彿
- * @param userId 鐢ㄦ埛缂栧彿
*/
- void submitSaleOrder(Long id, Long userId);
+ void cancelSaleOrder(Long id);
/**
- * 鏇存柊閿�鍞鍗曠殑瀹℃壒鐘舵��
+ * 閲嶆柊鍚敤閿�鍞鍗�
*
* @param id 缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
*/
- void updateSaleOrderAuditStatus(Long id, Integer bpmResult);
+ void enableSaleOrder(Long id);
/**
* 鏇存柊閿�鍞鍗曠殑鍑哄簱鏁伴噺
@@ -65,14 +63,6 @@
* @param outCountMap 鍑哄簱鏁伴噺 Map锛歬ey 閿�鍞鍗曢」缂栧彿锛泇alue 鍑哄簱鏁伴噺
*/
void updateSaleOrderOutCount(Long id, Map<Long, BigDecimal> outCountMap);
-
- /**
- * 鏇存柊閿�鍞鍗曠殑閫�璐ф暟閲�
- *
- * @param orderId 缂栧彿
- * @param returnCountMap 閫�璐ф暟閲� Map锛歬ey 閿�鍞鍗曢」缂栧彿锛泇alue 閫�璐ф暟閲�
- */
- void updateSaleOrderReturnCount(Long orderId, Map<Long, BigDecimal> returnCountMap);
/**
* 鍒犻櫎閿�鍞鍗�
@@ -123,4 +113,16 @@
*/
List<ErpSaleOrderItemDO> getSaleOrderItemListByOrderIds(Collection<Long> orderIds);
+ /**
+ * 鏇存柊閿�鍞鍗曠殑鍑哄簱鐘舵��
+ *
+ * 鏍规嵁鏄庣粏鍑哄簱鏁伴噺鑷姩璁＄畻璁㈠崟鐘舵�侊細
+ * - 鎵�鏈夋槑缁嗛兘瀹屾垚鍑哄簱 鈫� 鍏ㄩ儴鍑哄簱鐘舵��
+ * - 閮ㄥ垎鏄庣粏瀹屾垚鍑哄簱 鈫� 閮ㄥ垎鍑哄簱鐘舵��
+ * - 鏃犳槑缁嗗嚭搴� 鈫� 鏈嚭搴撶姸鎬�
+ *
+ * @param orderId 璁㈠崟缂栧彿
+ */
+ void updateSaleOrderOutStatus(Long orderId);
+
}
\ No newline at end of file
--
Gitblit v1.9.3