From 5477582a69ad5f4f43946d2fe7425419b6e0ce9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Wed, 14 May 2025 16:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=8E=A7=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3=E6=8E=88=E6=9D=83=E4=B8=BAnone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_workorder_exception/controllers/main.py | 2 ++ sf_manufacturing/models/sale_order.py | 2 +- sf_tool_management/controllers/controllers.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jikimo_workorder_exception/controllers/main.py b/jikimo_workorder_exception/controllers/main.py index cf208700..6134e27f 100644 --- a/jikimo_workorder_exception/controllers/main.py +++ b/jikimo_workorder_exception/controllers/main.py @@ -4,6 +4,7 @@ import json import logging from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect from odoo.addons.sf_manufacturing.controllers.controllers import Manufacturing_Connect +from odoo.addons.sf_base.decorators.api_log import api_log from datetime import datetime _logger = logging.getLogger(__name__) @@ -12,6 +13,7 @@ class WorkorderExceptionConroller(http.Controller): @http.route('/AutoDeviceApi/BillError', type='json', auth='public', methods=['GET', 'POST'], csrf=False, cors="*") + @api_log('工单对接错误', requester='中控系统') def workder_exception(self, **kw): """ 记录工单异常 diff --git a/sf_manufacturing/models/sale_order.py b/sf_manufacturing/models/sale_order.py index 4ce8750c..bec19018 100644 --- a/sf_manufacturing/models/sale_order.py +++ b/sf_manufacturing/models/sale_order.py @@ -76,7 +76,7 @@ class SaleOrder(models.Model): 'embryo_redundancy_id': line.embryo_redundancy_id, } product_name = '' - match = re.search(r'(S\d{5}-\d)', product.name) + match = re.search(r'(S\d{5}-\d*)', product.name) # 如果匹配成功，提取结果 if match: product_name = match.group(0) diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index 30833fbf..3cdaa374 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -41,6 +41,7 @@ class Manufacturing_Connect(http.Controller): @http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") + @api_log('功能刀具清单', requester='中控系统') def get_functional_tool_inventory_Info(self, **kw): """ 功能刀具清单接口 @@ -70,6 +71,7 @@ class Manufacturing_Connect(http.Controller): @http.route('/AutoDeviceApi/ToolEntity', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") + @api_log('功能刀具', requester='中控系统') def get_functional_tool_entity_Info(self, **kw): """ 功能刀具列表接口