From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +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 |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 c75f201..e1c0781 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,6 +43,20 @@
     void updateSaleOrderStatus(Long id, Integer status);
 
     /**
+     * 浣滃簾閿�鍞鍗�
+     *
+     * @param id 缂栧彿
+     */
+    void cancelSaleOrder(Long id);
+
+    /**
+     * 閲嶆柊鍚敤閿�鍞鍗�
+     *
+     * @param id 缂栧彿
+     */
+    void enableSaleOrder(Long id);
+
+    /**
      * 鏇存柊閿�鍞鍗曠殑鍑哄簱鏁伴噺
      *
      * @param id 缂栧彿
@@ -107,4 +121,16 @@
      */
     List<ErpSaleOrderItemDO> getSaleOrderItemListByOrderIds(Collection<Long> orderIds);
 
+    /**
+     * 鏇存柊閿�鍞鍗曠殑鍑哄簱鐘舵��
+     *
+     * 鏍规嵁鏄庣粏鍑哄簱鏁伴噺鑷姩璁$畻璁㈠崟鐘舵�侊細
+     * - 鎵�鏈夋槑缁嗛兘瀹屾垚鍑哄簱 鈫� 鍏ㄩ儴鍑哄簱鐘舵��
+     * - 閮ㄥ垎鏄庣粏瀹屾垚鍑哄簱 鈫� 閮ㄥ垎鍑哄簱鐘舵��
+     * - 鏃犳槑缁嗗嚭搴� 鈫� 鏈嚭搴撶姸鎬�
+     *
+     * @param orderId 璁㈠崟缂栧彿
+     */
+    void updateSaleOrderOutStatus(Long orderId);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3