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

修改功能刀具模块继承方式

Browse Source
This commit is contained in:
mgw
2023-07-20 09:17:21 +08:00
parent 532d5cbc6d
commit b37656d4fe
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sf_base/models/tool_base_new.py
View File

@@ -26,32 +26,32 @@ class FunctionalCuttingTool(models.Model):
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
string='整体式刀具型号', domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
string='整体式刀具型号', domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
string='刀片型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
string='刀片型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'rel_cutterbar_model_functional_sf',
string='刀杆型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
'rel_cutterbar_model_functional_sf',
string='刀杆型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'rel_cutterpad_model_functional_sf',
string='刀盘型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
'rel_cutterpad_model_functional_sf',
string='刀盘型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'rel_cutterhandle_model_functional_sf', string='刀柄型号',
domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
'rel_cutterhandle_model_functional_sf', string='刀柄型号',
domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'rel_cutterhead_model_functional_sf',
string='夹头型号', domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
'rel_cutterhead_model_functional_sf',
string='夹头型号', domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
diameter = fields.Float('直径(mm)')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],

8
sf_tool_management/models/base.py
View File

@@ -2,11 +2,17 @@
from odoo import fields, models, api
# class FunctionalCuttingToolEntity(models.Model):
# _name = 'sf.functional.cutting.tool.entity'
# _inherit = 'sf.functional.cutting.tool'
# _description = '功能刀具管理'
class FunctionalCuttingToolEntity(models.Model):
_name = 'sf.functional.cutting.tool.entity'
_inherit = 'sf.functional.cutting.tool'
_description = '功能刀具管理'
_inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
# 新添加的关联到原模型的字段
sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', ondelete='cascade')
order = fields.Char(string='序')
functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True)
# 功能刀具预警 特有字段

2
sf_tool_management/models/tool_material_search.py
View File

@@ -16,7 +16,7 @@ class SfToolMaterialSearch(models.Model):
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
# 关联刀具型号
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
# mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
# 关联刀具物料模型
mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')

2
sf_tool_management/views/tool_material_search.xml
View File

@@ -11,7 +11,7 @@
<field name="name"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_machine_brand_id"/>
<field name="mrs_cutting_tool_model_id"/>
<!-- <field name="mrs_cutting_tool_model_id"/> -->
<field name="mrs_materials_model_id"/>
<field name="mrs_cutting_tool_material_id"/>