Accept Merge Request #2117: (feature/6694 -> develop)
Merge Request: 修改中控日志接口授权为none Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2117?initial=true
This commit is contained in:
@@ -4,6 +4,7 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
|
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_manufacturing.controllers.controllers import Manufacturing_Connect
|
||||||
|
from odoo.addons.sf_base.decorators.api_log import api_log
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_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,
|
@http.route('/AutoDeviceApi/BillError', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
|
||||||
cors="*")
|
cors="*")
|
||||||
|
@api_log('工单对接错误', requester='中控系统')
|
||||||
def workder_exception(self, **kw):
|
def workder_exception(self, **kw):
|
||||||
"""
|
"""
|
||||||
记录工单异常
|
记录工单异常
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ class Manufacturing_Connect(http.Controller):
|
|||||||
|
|
||||||
@http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
|
@http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
|
||||||
cors="*")
|
cors="*")
|
||||||
|
@api_log('获取日计划', requester='中控系统')
|
||||||
def get_ShiftPlan(self, **kw):
|
def get_ShiftPlan(self, **kw):
|
||||||
"""
|
"""
|
||||||
自动化每天获取机台日计划
|
自动化每天获取机台日计划
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
|
|||||||
'embryo_redundancy_id': line.embryo_redundancy_id,
|
'embryo_redundancy_id': line.embryo_redundancy_id,
|
||||||
}
|
}
|
||||||
product_name = ''
|
product_name = ''
|
||||||
match = re.search(r'(S\d{5}-\d)', product.name)
|
match = re.search(r'(S\d{5}-\d*)', product.name)
|
||||||
# 如果匹配成功,提取结果
|
# 如果匹配成功,提取结果
|
||||||
if match:
|
if match:
|
||||||
product_name = match.group(0)
|
product_name = match.group(0)
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class Manufacturing_Connect(http.Controller):
|
|||||||
|
|
||||||
@http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
|
@http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
|
||||||
cors="*")
|
cors="*")
|
||||||
|
@api_log('功能刀具清单', requester='中控系统')
|
||||||
def get_functional_tool_inventory_Info(self, **kw):
|
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,
|
@http.route('/AutoDeviceApi/ToolEntity', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
|
||||||
cors="*")
|
cors="*")
|
||||||
|
@api_log('功能刀具', requester='中控系统')
|
||||||
def get_functional_tool_entity_Info(self, **kw):
|
def get_functional_tool_entity_Info(self, **kw):
|
||||||
"""
|
"""
|
||||||
功能刀具列表接口
|
功能刀具列表接口
|
||||||
|
|||||||
Reference in New Issue
Block a user