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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-07-24 11:42:44 +08:00
parent 3c89404543 24e9cc0658
commit abc7e1c8c6
8 changed files with 87 additions and 45 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')],

6
sf_base/views/fixture_view.xml
View File

@@ -21,7 +21,7 @@
<field name="name">夹具物料</field>
<field name="model">sf.fixture.material</field>
<field name="arch" type="xml">
<tree string="夹具物料">
<tree string="夹具物料" create="false">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
@@ -85,7 +85,7 @@
<field name="name">联装类型</field>
<field name="model">sf.multi_mounting.type</field>
<field name="arch" type="xml">
<tree string="联装类型">
<tree string="联装类型" create="false">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
@@ -159,7 +159,7 @@
<field name="name">夹具型号</field>
<field name="model">sf.fixture.model</field>
<field name="arch" type="xml">
<tree string="夹具型号">
<tree string="夹具型号" create="false">
<field name="code"/>
<field name="name"/>
<field name="brand_id"/>

4
sf_base/views/functional_fixture_view.xml
View File

@@ -22,7 +22,7 @@
<field name="name">功能夹具类型</field>
<field name="model">sf.functional.fixture.type</field>
<field name="arch" type="xml">
<tree string="功能夹具类型">
<tree string="功能夹具类型" create="false">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
@@ -81,7 +81,7 @@
<field name="name">功能夹具</field>
<field name="model">sf.functional.fixture</field>
<field name="arch" type="xml">
<tree string="功能夹具">
<tree string="功能夹具" create="false">
<field name="code"/>
<field name="name"/>
<field name="type_id"/>

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', '刀具物料')

13
sf_tool_management/views/menu_view.xml
View File

@@ -2,15 +2,6 @@
<odoo>
<data>
<record id="action_sf_functional_cutting_tool_warning" model="ir.actions.act_window">
<field name="name">功能刀具预警</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.cutting.tool.entity</field>
<field name="view_mode">tree</field>
</record>
<menuitem id="menu_sf_tool_manage"
name="刀具管理"
groups="mrp.group_mrp_routings"
@@ -20,7 +11,7 @@
id="menu_sf_functional_cutting_tool"
parent="menu_sf_tool_manage"
name="功能刀具列表"
sequence="3"
sequence="4"
action="sf_function_tool_entry_list_view_act"
/>
@@ -29,7 +20,7 @@
id="menu_sf_functional_cutting_tool_warning"
parent="menu_sf_tool_manage"
name="功能刀具预警"
sequence="4"
sequence="5"
action="action_sf_functional_cutting_tool_warning"
/>

65
sf_tool_management/views/tool_base_views.xml
View File

@@ -11,6 +11,12 @@
<field name="name" />
<field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="hide"/>
@@ -44,6 +50,23 @@
<field name="name" />
<field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="show"/>
<field name="tool_length" optional="show"/>
<field name="blade_number" optional="show"/>
<field name="integral_blade_length" optional="show"/>
<field name="effective_blade_length" optional="show"/>
<field name="max_life" optional="show"/>
<field name="is_standard" optional="show"/>
<field name="applicable_range" optional="show"/>
<field name="install_tool_time" optional="show"/>
<field name="outbound_time" optional="show"/>
<field name="machining_accuracy" optional="hide"/>
@@ -64,6 +87,14 @@
</field>
</record>
<record id="action_sf_functional_cutting_tool_warning" model="ir.actions.act_window">
<field name="name">功能刀具预警</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.cutting.tool.entity</field>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_functional_cutting_tool_warning_tree"/>
</record>
<!-- ========================================功能刀具出入库记录================================================================== -->
<record id="sf_function_tool_entry_exit_records_view_tree" model="ir.ui.view">
@@ -76,16 +107,23 @@
<field name="name"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_model_id"/>
<field name="diameter" optional="hide"/>
<field name="tool_grade" optional="hide"/>
<field name="machining_accuracy" optional="hide"/>
<field name="tool_length" optional="hide"/>
<field name="blade_number" optional="hide"/>
<field name="integral_blade_length" optional="hide"/>
<field name="effective_blade_length" optional="hide"/>
<field name="max_life" optional="hide"/>
<field name="is_standard" optional="hide"/>
<field name="applicable_range" optional="hide"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="show"/>
<field name="tool_length" optional="show"/>
<field name="blade_number" optional="show"/>
<field name="integral_blade_length" optional="show"/>
<field name="effective_blade_length" optional="show"/>
<field name="max_life" optional="show"/>
<field name="is_standard" optional="show"/>
<field name="applicable_range" optional="show"/>
<field name="thickness" optional="show"/>
<field name="max_life_span" optional="show"/>
<field name="alarm_value" optional="show"/>
@@ -127,6 +165,12 @@
<!-- <field name="order"/>-->
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="show"/>
@@ -137,6 +181,7 @@
<field name="max_life" optional="show"/>
<field name="is_standard" optional="show"/>
<field name="applicable_range" optional="show"/>
<field name="tool_stock_num" optional="show"/>
<field name="side_shelf_num" optional="show"/>
<field name="on_tool_stock_num" optional="show"/>

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"/>