jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/新增中控接口' into feature/中控接口14-19优化

Browse Source
This commit is contained in:
yuxianghui
2024-02-22 10:17:24 +08:00
parent 8695a66e3d ce01127664
commit 5f760cf94b
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/controllers/controllers.py
View File

@@ -8,7 +8,7 @@ from odoo.http import request
class Manufacturing_Connect(http.Controller): class Manufacturing_Connect(http.Controller):
@http.route('/AutoDeviceApi/MaintenanceToolGroups', type='json', auth='none', methods=['GET', 'POST'], csrf=False, @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*") cors="*")
def get_maintenance_tool_groups_Info(self, **kw): def get_maintenance_tool_groups_Info(self, **kw):
""" """
@@ -20,7 +20,7 @@ class Manufacturing_Connect(http.Controller):
try: try:
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
ret = json.loads(ret['result']) # ret = json.loads(ret['result'])
logging.info('DeviceId:%s' % ret) logging.info('DeviceId:%s' % ret)
tool_groups = request.env['sf.tool.groups'].sudo().search([]) tool_groups = request.env['sf.tool.groups'].sudo().search([])

2
sf_base/models/tool_base_new.py
View File

@@ -256,7 +256,7 @@ class ToolGroups(models.Model):
# ==========机床刀具组接口========== # ==========机床刀具组接口==========
def _register_tool_groups(self, obj): def _register_tool_groups(self, obj):
create_url = '/AutoDeviceApi/MaintenanceToolGroups' create_url = '/AutoDeviceApi/MachineToolGroup'
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']

2
sf_quality/models/quality.py
View File

@@ -11,7 +11,7 @@ class QualityCheck(models.Model):
# ==========零件特采接口========== # ==========零件特采接口==========
def _register_tool_groups(self): def _register_tool_groups(self):
create_url = '/AutoDeviceApi/ModSpecial' create_url = '/AutoDeviceApi/PartSpecProc'
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']

8
sf_tool_management/controllers/controllers.py
View File

@@ -8,7 +8,7 @@ from odoo.http import request
class Manufacturing_Connect(http.Controller): class Manufacturing_Connect(http.Controller):
@http.route('/AutoDeviceApi/MachineToolLibrary', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, @http.route('/AutoDeviceApi/GetToolInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*") cors="*")
def get_equipment_tool_Info(self, **kw): def get_equipment_tool_Info(self, **kw):
""" """
@@ -20,7 +20,7 @@ class Manufacturing_Connect(http.Controller):
try: try:
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
ret = json.loads(ret['result']) ret = json.loads(ret.get('result'))
logging.info('DeviceId:%s' % ret) logging.info('DeviceId:%s' % ret)
equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', ret['DeviceId'])]) equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', ret['DeviceId'])])
@@ -56,7 +56,7 @@ class Manufacturing_Connect(http.Controller):
logging.info('get_equipment_tool_Info error:%s' % e) logging.info('get_equipment_tool_Info error:%s' % e)
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/ToolGroups', type='json', auth='none', methods=['GET', 'POST'], csrf=False, @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*") cors="*")
def get_functional_tool_groups_Info(self, **kw): def get_functional_tool_groups_Info(self, **kw):
""" """
@@ -68,7 +68,7 @@ class Manufacturing_Connect(http.Controller):
try: try:
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
ret = json.loads(ret['result']) # ret = json.loads(ret['result'])
logging.info('DeviceId:%s' % ret) logging.info('DeviceId:%s' % ret)
functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([]) functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([])

2
sf_tool_management/models/base.py
View File

@@ -180,7 +180,7 @@ class FunctionalCuttingToolEntity(models.Model):
# ==========刀具组接口========== # ==========刀具组接口==========
def _register_functional_tool_groups(self, obj): def _register_functional_tool_groups(self, obj):
create_url = '/AutoDeviceApi/ToolGroups' create_url = '/AutoDeviceApi/ToolGroup'
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']

2
sf_tool_management/models/mrp_workorder.py
View File

@@ -11,7 +11,7 @@ class CNCprocessing(models.Model):
# ==========MES装刀指令接口========== # ==========MES装刀指令接口==========
def register_cnc_processing(self, cnc_processing): def register_cnc_processing(self, cnc_processing):
create_url = '/AutoDeviceApi/MESToolLoadingInstruction' create_url = '/AutoDeviceApi/ToolLoadInstruct'
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']