diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 4bb32b60..ae66a87c 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -7,7 +7,7 @@ class ToolChangeRequirementInformation(models.TransientModel): # tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请') - CNC_machine_table = fields.Char(string='CNC机床', readonly=True) + name = fields.Char(string='CNC机床', readonly=True) machine_tool_code = fields.Char(string='机台号', readonly=True) cutter_spacing_code = fields.Char(string='刀位号', readonly=True) @@ -29,7 +29,7 @@ class ToolChangeRequirementInformation(models.TransientModel): """ # 封装数据 desc = { - 'CNC_machine_table': self.CNC_machine_table, + 'name': self.name, 'machine_tool_code': self.machine_tool_code, 'cutter_spacing_code': self.cutter_spacing_code, 'replacement_tool_code': self.replacement_tool_code, @@ -46,18 +46,18 @@ class ToolChangeRequirementInformation(models.TransientModel): print('desc:', desc) # 将数据更新到机台换刀申请界面 self.env['sf.machine.table.tool.changing.apply'].search( - [('CNC_machine_table', '=', desc.get('CNC_machine_table'))]).write(desc) + [('name', '=', desc.get('name'))]).write(desc) # 功能刀具组装创建新任务 self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({ 'functional_tool_code': self.replacement_tool_code, - 'functional_tool_name': self.replacement_tool_name, + 'name': self.replacement_tool_name, 'functional_tool_type': self.replacement_tool_type, 'loading_task_source': '1', 'applicant': self.applicant, 'reason_for_applying': self.reason_for_applying, 'use_tool_time': self.used_tool_time, - 'machine_tool_name': self.CNC_machine_table, + 'machine_tool_name': self.name, 'machine_tool_code': self.machine_tool_code, 'cutter_spacing_code': self.cutter_spacing_code }) @@ -133,7 +133,7 @@ class ApplyForTooling(models.TransientModel): """ self.env['sf.functional.tool.assembly'].create({ 'functional_tool_code': self.functional_tool_code, - 'functional_tool_name': self.functional_tool_name, + 'name': self.functional_tool_name, 'functional_tool_type': self.functional_tool_type, 'functional_tool_diameter': self.diameter, 'functional_tool_length': self.tool_loading_length, @@ -227,7 +227,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel): order = fields.Integer(string='序') functional_tool_code = fields.Char(string='功能刀具编码') - functional_tool_name = fields.Char(string='功能刀具名称') + name = fields.Char(string='功能刀具名称') functional_tool_type = fields.Char(string='功能刀具类型') production_line_name = fields.Char(string='产线名称') machine_tool_code = fields.Char(string='机台号') @@ -244,7 +244,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel): for val in vals: self.env['sf.functional.tool.assembly'].search([ ('functional_tool_code', '=', val.functional_tool_code), - ('functional_tool_name', '=', val.functional_tool_name) + ('name', '=', val.name) ]).write({ 'assemble_status': '2', 'receive_person': self.env.user.name, @@ -253,13 +253,13 @@ class DeliveryOfCargoFromStorage(models.TransientModel): tool_assembly = self.env['sf.functional.tool.assembly'].search([ ('functional_tool_code', '=', val.functional_tool_code), - ('functional_tool_name', '=', val.functional_tool_name) + ('name', '=', val.name) ]) # 判断装刀任务来源,如果来源于CAM装刀,则修改CAM装刀的计划执行状态 if tool_assembly.loading_task_source == '0': self.env['sf.cam.work.order.program.knife.plan'].search([ ('functional_tool_code', '=', val.functional_tool_code), - ('functional_tool_name', '=', val.functional_tool_name) + ('functional_tool_name', '=', val.name) ]).write({ 'plan_execute_status': '2' }) diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index e99f61ed..b0b345df 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -10,7 +10,7 @@ - + @@ -275,7 +275,7 @@ - +