diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 2abcc2e7..e4b49292 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from odoo import fields, models, api +from odoo import SUPERUSER_ID # class FunctionalCuttingToolEntity(models.Model): @@ -347,9 +348,9 @@ class MachineTableToolChangingApply(models.Model): # string='换刀需求信息', # attrs="{'invisible': 1}") - name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=False) - machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=False) - machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}") + name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False,tracking=True, group_expand='_read_group_names') + machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, compute='_compute_name') + machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}", readonly=True, compute='_compute_name') cutter_spacing_code = fields.Char(string='刀位号', readonly=False) functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id') functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) @@ -363,9 +364,9 @@ class MachineTableToolChangingApply(models.Model): used_value = fields.Char(string='已使用值', readonly=False) functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False) - replacement_tool_code = fields.Char(string='待换刀具编码', readonly=True) - replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称', readonly=True) - replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型', readonly=True) + replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True) + replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称', readonly=True) + replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', readonly=True) replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) @@ -376,6 +377,18 @@ class MachineTableToolChangingApply(models.Model): status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') + @api.model + def _read_group_names(self, categories, domain, order): + names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(names) + + @api.depends('name') + def _compute_name(self): + for record in self: + if record: + record.machine_table_type_id = record.name.machine_tool_category.id + record.machine_tool_code = record.name.code + @api.depends('functional_tool_name_id') def _compute_functional_tool_name_id(self): for record in self: @@ -383,7 +396,6 @@ class MachineTableToolChangingApply(models.Model): record.functional_tool_code = record.functional_tool_name_id.code record.functional_tool_type_id = record.functional_tool_name_id.mrs_cutting_tool_type_id.id - @api.onchange('functional_tool_status') def automation_apply_for_tool_change(self): """ @@ -484,16 +496,22 @@ class CAMWorkOrderProgramKnifePlan(models.Model): functional_tool_code = fields.Char(string='功能刀具编码', readonly=False) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False) - machine_table_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=False) + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, group_expand='_read_group_machine_table_name_ids') + + @api.model + def _read_group_machine_table_name_ids(self, categories, domain, order): + machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(machine_table_name_ids) + machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False) diameter = fields.Char(string='直径（程式）', readonly=False) tool_loading_length = fields.Char(string='装刀长', readonly=False) clearance_length = fields.Char(string='避空长', readonly=False) tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False) L_D = fields.Char(string='L/D', readonly=False) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) - required_cutting_time = fields.Char(string='需要切割时间', readonly=False) - whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=False) + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, default='2') + required_cutting_time = fields.Char(string='需切削时长', readonly=False) + whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')],string='是否标准刀', readonly=False, default='1') need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False) plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0', readonly=False) @@ -556,7 +574,14 @@ class FunctionalToolAssembly(models.Model): functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) - functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) + functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + tracking=True, group_expand='_read_group_functional_tool_type_ids') + @api.model + def _read_group_functional_tool_type_ids(self, categories, domain, order): + """读取分组自定义以便在看板视图中显示所有的类别，即使它们为空""" + functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(functional_tool_type_ids) + functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True) functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) @@ -605,7 +630,6 @@ class FunctionalToolAssembly(models.Model): chuck_name = fields.Char('夹头名称', readonly=True) sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) tool_loading_length = fields.Char(string='装刀长', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) @@ -621,7 +645,7 @@ class FunctionalToolAssembly(models.Model): assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True) production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False) - machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True) + machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True) machine_tool_code = fields.Char(string='机台号', readonly=True) cutter_spacing_code = fields.Char(string='刀位号', readonly=True) @@ -633,12 +657,6 @@ class FunctionalToolAssembly(models.Model): check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False) - @api.onchange('assemble_status') - def check_box(self): - if self.assemble_status != '1': - self.check_box_1 = False - - def cancel_functional_tool_assembly(self): """ 取消功能刀具组装 diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 298ae51c..87aceb92 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -551,6 +551,8 @@ type="action" context="{ 'default_name':name, 'default_machine_tool_code': machine_tool_code, + 'default_functional_tool_name_id': functional_tool_name_id, + 'default_functional_tool_type_id': functional_tool_type_id, 'default_cutter_spacing_code': cutter_spacing_code, 'default_replacement_tool_code': functional_tool_code, 'default_replacement_tool_name_id': functional_tool_name_id, @@ -571,8 +573,8 @@ class="btn-primary" attrs="{'invisible': [('status', '!=', '0')]}" /> -