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/sf刀具功能分支

Browse Source 
# Conflicts:
#	sf_tool_management/views/tool_base_views.xml
This commit is contained in:
yuxianghui
2023-06-28 09:15:55 +08:00
parent d6f749fff5 8b94696dc3
commit c94c661506
18 changed files with 3206 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_tool_management/views/menu_view.xml
View File

@@ -21,7 +21,7 @@
parent="menu_sf_tool_manage"
name="功能刀具列表"
sequence="3"
action="sf_base.action_sf_functional_cutting_tool"
action="sf_function_tool_entry_list_view_act"
/>
@@ -29,8 +29,8 @@
id="menu_sf_functional_cutting_tool_warning"
parent="menu_sf_tool_manage"
name="功能刀具预警"
sequence="3"
action="action_sf_functional_cutting_tool_warning"
sequence="4"
action="sf_function_tool_entry_warning_view_act"
/>
<menuitem

42
sf_tool_management/views/tool_base_views.xml
View File

@@ -1,6 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data>
<!-- 功能刀具列表tree view -->
<record id="view_functional_cutting_tool_list_tree" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.entity.list.tree</field>
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<tree string="功能刀具">
<field name="code" />
<field name="name" />
<field name="functional_model_number" />
<field name="integral_model_number"/>
<field name="blade_model_number" optional="hide"/>
<field name="cutterbar_model_number" optional="hide"/>
<field name="cutterpad_model_number" optional="hide"/>
<field name="handle_model_number" optional="hide"/>
<field name="chuck_model_number" optional="hide"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="hide"/>
<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="image" widget='image' optional="show"/>
</tree>
</field>
</record>
<record id="sf_function_tool_entry_list_view_act" 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_list_tree"/>
</record>
<!-- 功能刀具预警tree view -->
<record id="view_functional_cutting_tool_warning_tree" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.entity.tree</field>
@@ -36,7 +75,8 @@
</field>
</record>
<!-- ========================================功能刀具出入库记录======================================================== -->
<!-- ========================================功能刀具出入库记录================================================================== -->
<record id="sf_function_tool_entry_exit_records_view_tree" model="ir.ui.view">
<field name="name">功能刀具出入库记录</field>
<field name="model">sf.functional.cutting.tool.entity</field>