diff --git a/sf_base/controllers/controllers.py b/sf_base/controllers/controllers.py index ca600580..71ed8f94 100644 --- a/sf_base/controllers/controllers.py +++ b/sf_base/controllers/controllers.py @@ -8,7 +8,7 @@ from odoo.http import request class Manufacturing_Connect(http.Controller): - @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, cors="*") def get_maintenance_tool_groups_Info(self, **kw): """ diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py index ea3d5f3a..92914344 100644 --- a/sf_quality/models/quality.py +++ b/sf_quality/models/quality.py @@ -15,7 +15,7 @@ class QualityCheck(models.Model): config = self.env['res.config.settings'].get_values() # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A] headers = {'Authorization': config['center_control_Authorization']} - crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos" + crea_url = config['center_control_url'] + "/AutoDeviceApi/PartSpecProc" origin = self.picking_id.origin production_id = self.env['mrp.production'].sudo().search([('name', '=', origin)]) rfid = '' if not production_id.workorder_ids else production_id.workorder_ids[-1].rfid_code or '' diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index c8d6ee3f..a524f0bc 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -8,7 +8,7 @@ from odoo.http import request class Manufacturing_Connect(http.Controller): - @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, cors="*") def get_functional_tool_groups_Info(self, **kw): """ diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 43baaab5..e6e5d1eb 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -258,13 +258,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model): names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(names) - @api.onchange('plan_execute_status') - def _onchange_plan_execute_status(self): - for record in self: - if record.plan_execute_status == '已完成': - self.env['sf.cnc.processing'].register_cnc_processing(record) - def knife_plan_cnc_processing(self): + # MES装刀指令接口 測試 self.env['sf.cnc.processing'].register_cnc_processing(self) def apply_for_tooling(self): diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index 2821e277..45ddb317 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -15,7 +15,7 @@ class CNCprocessing(models.Model): config = self.env['res.config.settings'].get_values() # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A] headers = {'Authorization': config['center_control_Authorization']} - crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos" + crea_url = config['center_control_url'] + "/AutoDeviceApi/ToolLoadInstruct" val = { 'DeviceId': knife_plan.machine_table_name, 'RfidCode': knife_plan.sf_functional_tool_assembly_id.rfid, diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index a97e7274..267e9a32 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -598,9 +598,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel): ]).write({'status': '3'}) elif functional_tool_assembly.sf_cam_work_order_program_knife_plan_id: # 修改CAM工单程序用刀计划状态 - self.env['sf.cam.work.order.program.knife.plan'].sudo().search([ + cam_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().search([ ('id', '=', functional_tool_assembly.sf_cam_work_order_program_knife_plan_id.id) - ]).write({'plan_execute_status': '2'}) + ]) + cam_plan.write({'plan_execute_status': '2'}) + self.env['sf.cnc.processing'].register_cnc_processing(cam_plan) # 关闭弹出窗口 return {'type': 'ir.actions.act_window_close'} diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index 50469284..3a98116a 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -500,8 +500,12 @@ class ShelfLocation(models.Model): # sf_secret_key = sf_sync_config['sf_secret_key'] # headers = Common.get_headers(self, token, sf_secret_key) # strurl = sf_sync_config['sf_url'] + self.crea_url - headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'} - crea_url = 'https://x24467i973.zicp.fun/AutoDeviceApi/GetLocationInfos' + config = self.env['res.config.settings'].get_values() + # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A] + headers = {'Authorization': config['center_control_Authorization']} + crea_url = config['center_control_url'] + "/AutoDeviceApi/GetLocationInfos" + # headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603'} + # crea_url = 'https://x24467i973.zicp.fun/AutoDeviceApi/GetLocationInfos' # objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)]) # machine_tool_list = []