diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py index 1c8dadbb..33426cd4 100644 --- a/sf_base/models/tool_base.py +++ b/sf_base/models/tool_base.py @@ -17,68 +17,6 @@ class CuttingToolMaterial(models.Model): remark = fields.Char('备注') -# 测试模型 -class aa_test(models.Model): - _name = 'sf.test' - _description = '测试' - - model_number = fields.Char('型号', readonly=True) - # 关联刀具物料 - cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') - # 关联整体式刀具型号 - integral_model_number = fields.Many2one('sf.integral.cutting.tool.model', '整体式刀具型号') - # 关联刀片型号 - blade_model_number = fields.Many2one('sf.blade', '刀片型号') - # 关联刀杆型号 - cutterbar_model_number = fields.Many2one('sf.cutter.bar', '刀杆型号') - # 关联刀盘型号 - cutterpad_model_number = fields.Many2one('sf.cutter.pad', '刀盘型号') - # 关联刀柄型号 - handle_model_number = fields.Many2one('sf.handle', '刀柄型号') - # 关联夹头型号 - chuck_model_number = fields.Many2one('sf.chuck', '夹头型号') - - hide_integral_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏整体式刀具型号') - hide_blade_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀片型号') - hide_cutterbar_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀杆型号') - hide_cutterpad_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀盘型号') - hide_handle_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀柄型号') - hide_chuck_model_number = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏夹头型号') - hide_model_number = fields.Boolean(compute='_compute_hide_model_number', default=True, string='隐藏型号') - - @api.depends('cutting_tool_material') - def _compute_hide_model_number(self): - for record in self: - record.hide_integral_model_number = False - record.hide_blade_model_number = False - record.hide_cutterbar_model_number = False - record.hide_cutterpad_model_number = False - record.hide_handle_model_number = False - record.hide_chuck_model_number = False - record.hide_model_number = True - - if record.cutting_tool_material and record.cutting_tool_material.name == '整体式刀具': - record.hide_model_number = False - record.hide_integral_model_number = True - elif record.cutting_tool_material and record.cutting_tool_material.name == '刀片': - record.hide_model_number = False - record.hide_blade_model_number = True - elif record.cutting_tool_material and record.cutting_tool_material.name == '刀杆': - record.hide_model_number = False - record.hide_cutterbar_model_number = True - elif record.cutting_tool_material and record.cutting_tool_material.name == '刀盘': - record.hide_model_number = False - record.hide_cutterpad_model_number = True - elif record.cutting_tool_material and record.cutting_tool_material.name == '刀柄': - record.hide_model_number = False - record.hide_handle_model_number = True - elif record.cutting_tool_material and record.cutting_tool_material.name == '夹头': - record.hide_model_number = False - record.hide_chuck_model_number = True - else: - record.hide_model_number = True - - # 功能刀具 class FunctionalCuttingTool(models.Model): _name = 'sf.functional.cutting.tool' diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index c21529ff..f07b2fcb 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -32,7 +32,6 @@ access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1 access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1 access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,base.group_user,1,1,1,1 access_sf_cutting_tool_material,sf.cutting.tool.material,model_sf_cutting_tool_material,base.group_user,1,1,1,1 -access_sf_test,sf.test,model_sf_test,base.group_user,1,1,1,1 access_sf_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1 access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1 diff --git a/sf_base/views/menu_fixture_view.xml b/sf_base/views/menu_fixture_view.xml index ab7981c4..4a5e1283 100644 --- a/sf_base/views/menu_fixture_view.xml +++ b/sf_base/views/menu_fixture_view.xml @@ -8,7 +8,7 @@ diff --git a/sf_base/views/tool_base_menu.xml b/sf_base/views/tool_base_menu.xml index 71c0b6ef..bfb56640 100644 --- a/sf_base/views/tool_base_menu.xml +++ b/sf_base/views/tool_base_menu.xml @@ -107,16 +107,8 @@ sf.cutting.tool.material tree,form - - - 测试 - ir.actions.act_window - sf.test - tree,form - - - + - - - - diff --git a/sf_base/views/tool_base_views.xml b/sf_base/views/tool_base_views.xml index 30816d77..1dfb7ca7 100644 --- a/sf_base/views/tool_base_views.xml +++ b/sf_base/views/tool_base_views.xml @@ -738,49 +738,5 @@ - - - sf.test.tree - sf.test - - - - - - - - - sf.test.form - sf.test - -
- - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-