From 356e1e55e46b81550bc5781a5f93d4852963bfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Mon, 10 Feb 2025 09:03:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E7=9B=91=E9=80=89=E6=8B=A9=E9=94=80=E5=94=AE=E5=91=98?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 31681932..4d0106bc 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -517,9 +517,10 @@ class ResUserToSale(models.Model):
 
     @api.model
     def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
+        domain = []
         if self._context.get('is_sale'):
             if self.env.user.has_group('sf_base.group_sale_director'):
-                domain = []
+                pass
             elif self.env.user.has_group('sf_base.group_sale_salemanager'):
                 if self.id != self.env.user.id:
                     domain = [('id', '=', self.id)]
@@ -528,7 +529,7 @@ class ResUserToSale(models.Model):
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         elif self._context.get('supplier_rank'):
             if self.env.user.has_group('sf_base.group_purchase_director'):
-                domain = []
+                pass
             elif self.env.user.has_group('sf_base.group_purchase'):
                 if self.id != self.env.user.id:
                     domain = [('id', '=', self.id)]

From 5dc5602e3de144a110b7aac60e4350b8da798275 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 10 Feb 2025 09:47:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/controllers/controllers.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py
index 70a8d68f..d79e7137 100644
--- a/sf_bf_connect/controllers/controllers.py
+++ b/sf_bf_connect/controllers/controllers.py
@@ -132,6 +132,26 @@ class Sf_Bf_Connect(http.Controller):
             request.cr.rollback()
             return json.JSONEncoder().encode(res)
 
+    @http.route('/api/bfm_cancel_order', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_bfm_cancel_order(self, **kw):
+        """
+        业务平台取消销售订单
+        :param kw:
+        :return:
+        """
+        res = {'status': 1, 'message': '工厂取消销售订单成功'}
+        logging.info('get_bfm_cancel_order:%s' % kw['order_number'])
+        try:
+            sale_order_info = request.env['sale.order'].sudo().search([('name', '=', kw['order_number'])])
+            sale_order_info._action_cancel()
+            return json.JSONEncoder().encode(res)
+        except Exception as e:
+            logging.error('get_bfm_cancel_order error: %s' % e)
+            res['status'] = -1
+            res['message'] = '工厂取消销售订单失败，请联系管理员'
+            return json.JSONEncoder().encode(res)
+
 
 class jdElcp(http.Controller):