处理冲突

This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions

View File

@@ -255,156 +255,6 @@
</p>
</field>
</record>
#------------------刀具型号------------------
<record model="ir.ui.view" id="search_sf_cutting_tool_type_view">
<field name="name">search.sf.cutting_tool.type</field>
<field name="model">sf.cutting_tool.type</field>
<field name="arch" type="xml">
<search string="刀具型号">
<field name="name" string="模糊搜索"
filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
</search>
</field>
</record>
<record model="ir.ui.view" id="tree_cutting_tool_type_view">
<field name="name">tree.sf.cutting_tool.type</field>
<field name="model">sf.cutting_tool.type</field>
<field name="arch" type="xml">
<tree string="刀具型号">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="form_sf_cutting_tool_type">
<field name="name">form.sf.cutting_tool.type</field>
<field name="model">sf.cutting_tool.type</field>
<field name="arch" type="xml">
<form string="刀具型号">
<group string="基本信息">
<group>
<field name="code" force_save="1" readonly="1"/>
<field name="category_id" string="类别" required="1"/>
</group>
<group>
<field name="name" required="1"/>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"/>
</group>
</group>
<group string="刀具参数">
<group>
<field name="taper_shank_length" required="1" options="{'format': false}"/>
<field name="long_blade" required="1" options="{'format': false}"/>
<field name="tool_length" required="1" options="{'format': false}"/>
</group>
<group>
<field name="diameter" required="1" options="{'format': false}"/>
<field name="shank_diameter" required="1" options="{'format': false}"/>
<field name="cone_angle_pitch" required="1" options="{'format': false}"/>
<field name="blade_number" required="1" options="{'format': false}"/>
</group>
</group>
<group string="其它">
<field name="remark"/>
</group>
</form>
</field>
</record>
<record id="action_sf_cutting_tool_type" model="ir.actions.act_window">
<field name="name">刀具型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting_tool.type</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
[刀具型号] 还没有哦!点左上角的[创建]按钮,沙发归你了!
</p>
<p>
</p>
</field>
</record>
#------------------刀具类别------------------
<record model="ir.ui.view" id="search_sf_cutting_tool_category_view">
<field name="name">search.sf.cutting_tool.category</field>
<field name="model">sf.cutting_tool.category</field>
<field name="arch" type="xml">
<search string="刀具类别">
<field name="name" string="模糊搜索"
filter_domain="['|',('name', 'ilike', self),('remark', 'ilike', self)]"/>
</search>
</field>
</record>
<record model="ir.ui.view" id="tree_sf_cutting_tool_category_view">
<field name="name">tree.sf.cutting_tool.category</field>
<field name="model">sf.cutting_tool.category</field>
<field name="arch" type="xml">
<tree string="刀具类别">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="sf_cutting_tool_category_form">
<field name="name">form.sf.cutting_tool.category</field>
<field name="model">sf.cutting_tool.category</field>
<field name="arch" type="xml">
<form string="刀具类别">
<group string="基本信息">
<group>
<field name="code" readonly="1"/>
</group>
<group>
<field name="name" required="1"/>
</group>
</group>
<!-- <group string="参数">-->
<!-- <field name="type_ids" string="刀具型号">-->
<!-- <tree editable="bottom">-->
<!-- <field name="category_id" invisible="True"/>-->
<!-- <field name="code" string="编码" required="True"/>-->
<!-- <field name="name" string="名称" required="True"/>-->
<!-- <field name="diameter" string="直径" required="True"/>-->
<!-- <field name="long_blade" string="避空长/刃长" required="True"/>-->
<!-- <field name="cone_angle_pitch" string="锥角/节距" required="True"/>-->
<!-- <field name="shank_diameter" string="柄径" required="True"/>-->
<!-- <field name="taper_shank_length" string="锥柄" required="True"/>-->
<!-- <field name="tool_length" string="刀具总长" required="True"/>-->
<!-- <field name="blade_number" string="刃数" required="True"/>-->
<!-- <field name="remark" string="备注"/>-->
<!-- <field name="active" string="有效"/>-->
<!-- </tree>-->
<!-- </field>-->
<!-- </group>-->
<group string="其它">
<field name="remark"/>
</group>
</form>
</field>
</record>
<record id="action_sf_cutting_tool_category" model="ir.actions.act_window">
<field name="name">刀具类别</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting_tool.category</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
[刀具类别] 还没有哦!点左上角的[创建]按钮,沙发归你了!
</p>
<p>
</p>
</field>
</record>
#------------------机床注册------------------

View File

@@ -0,0 +1,681 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- ======================================定位元件型号view视图================================================== -->
<record id="sf_fixture_setting_element_view_tree" model="ir.ui.view">
<field name="name">定位元件型号</field>
<field name="model">sf.fixture.setting.element</field>
<field name="arch" type="xml">
<tree string="定位元件型号">
<field name="code"/>
<field name="name"/>
<field name="setting_ele_type_id"/>
<field name="brand_id"/>
<field name="picture" widget="image"/>
</tree>
</field>
</record>
<record id="sf_fixture_setting_element_view_form" model="ir.ui.view">
<field name="name">定位元件型号</field>
<field name="model">sf.fixture.setting.element</field>
<field name="arch" type="xml">
<form string="定位元件型号">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="setting_ele_type_id"/>
<field name="brand_id"/>
</group>
<group>
<field name="picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
<field name="length"/>
<field name="width"/>
<field name="height"/>
<field name="diameter"/>
</group>
<group>
<field name="material_type_id"/>
<field name="hardness"/>
<field name="surface_treatment"/>
<field name="accuracy_grade"/>
<field name="chucking_power"/>
</group>
</group>
<group string="其他">
<group>
<field name="comment"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_fixture_setting_element_view_act" model="ir.actions.act_window">
<field name="name">定位元件型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.fixture.setting.element</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ======================================定位原件类型================================================== -->
<record id="sf_setting_element_type_view_tree" model="ir.ui.view">
<field name="name">定位原件类型</field>
<field name="model">sf.setting.element.type</field>
<field name="arch" type="xml">
<tree string="定位原件类型">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_setting_element_type_view_form" model="ir.ui.view">
<field name="name">定位元件类型</field>
<field name="model">sf.setting.element.type</field>
<field name="arch" type="xml">
<form string="定位元件类型">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_setting_element_type_view_act" model="ir.actions.act_window">
<field name="name">定位元件类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.setting.element.type</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ======================================夹紧元件型号================================================== -->
<record id="sf_fixture_clamping_element_view_tree" model="ir.ui.view">
<field name="name">夹紧元件型号</field>
<field name="model">sf.fixture.clamping.element</field>
<field name="arch" type="xml">
<tree string="夹紧元件型号">
<field name="code"/>
<field name="name"/>
<field name="clamping_ele_type_id"/>
<field name="brand_id"/>
<field name="picture" widget="image"/>
</tree>
</field>
</record>
<record id="sf_fixture_clamping_element_view_form" model="ir.ui.view">
<field name="name">夹紧元件型号</field>
<field name="model">sf.fixture.clamping.element</field>
<field name="arch" type="xml">
<form string="夹紧元件型号">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="clamping_ele_type_id"/>
<field name="brand_id"/>
</group>
<group>
<field name="picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
<field name="length"/>
<field name="width"/>
<field name="height"/>
<field name="diameter"/>
</group>
<group>
<field name="material_type_id"/>
<field name="hardness"/>
<field name="chucking_power"/>
<field name="surface_treatment"/>
<field name="accuracy_grade"/>
</group>
</group>
<group string="其他">
<group>
<field name="comment"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_fixture_clamping_element_view_act" model="ir.actions.act_window">
<field name="name">夹紧元件型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.fixture.clamping.element</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ======================================夹紧元件类型================================================== -->
<record id="sf_clamping_element_type_view_tree" model="ir.ui.view">
<field name="name">夹紧元件类型</field>
<field name="model">sf.clamping.element.type</field>
<field name="arch" type="xml">
<tree string="夹紧元件类型">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_clamping_element_type_view_form" model="ir.ui.view">
<field name="name">夹紧元件类型</field>
<field name="model">sf.clamping.element.type</field>
<field name="arch" type="xml">
<form string="夹紧元件类型">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_clamping_element_type_view_act" model="ir.actions.act_window">
<field name="name">夹紧元件类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.clamping.element.type</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ===================================对刀夹具型号view视图============================================ -->
<record id="sf_fixture_tool_setting_view_tree" model="ir.ui.view">
<field name="name">对刀夹具型号</field>
<field name="model">sf.fixture.tool.setting</field>
<field name="arch" type="xml">
<tree string="对刀夹具型号">
<field name="code"/>
<field name="name"/>
<field name="tool_setting_type_id"/>
<field name="brand_id"/>
<field name="picture" widget="image"/>
</tree>
</field>
</record>
<record id="sf_fixture_tool_setting_view_form" model="ir.ui.view">
<field name="name">对刀夹具型号</field>
<field name="model">sf.fixture.tool.setting</field>
<field name="arch" type="xml">
<form string="对刀夹具型号">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="tool_setting_type_id"/>
<field name="brand_id"/>
</group>
<group>
<field name="picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
<field name="length"/>
<field name="width"/>
<field name="height"/>
<field name="diameter"/>
<field name="hardness"/>
</group>
<group>
<field name="clamp_mode"/>
<field name="accuracy_grade"/>
<field name="max_clamp_diameter"/>
<field name="material_type_id"/>
<field name="chucking_power"/>
</group>
</group>
<group string="其他">
<group>
<field name="comment"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_fixture_tool_setting_view_act" model="ir.actions.act_window">
<field name="name">对刀夹具型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.fixture.tool.setting</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ==================================对刀夹具类型view视图=============================================== -->
<record id="sf_tool_setting_type_view_tree" model="ir.ui.view">
<field name="name">对刀夹具类型</field>
<field name="model">sf.tool.setting.type</field>
<field name="arch" type="xml">
<tree string="对刀夹具类型">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_tool_setting_type_view_form" model="ir.ui.view">
<field name="name">对刀夹具类型</field>
<field name="model">sf.tool.setting.type</field>
<field name="arch" type="xml">
<form string="对刀夹具类型">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_tool_setting_type_view_act" model="ir.actions.act_window">
<field name="name">对刀夹具类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.tool.setting.type</field>
<field name="view_mode">tree,form</field>
</record>
<!-- =================================定位装置型号view视图==================================== -->
<record id="sf_fixture_locating_device_view_tree" model="ir.ui.view">
<field name="name">定位装置型号</field>
<field name="model">sf.fixture.locating.device</field>
<field name="arch" type="xml">
<tree string="定位装置型号">
<field name="code"/>
<field name="name"/>
<field name="locating_device_type_id"/>
<field name="brand_id"/>
<field name="picture" widget="image"/>
</tree>
</field>
</record>
<record id="sf_fixture_locating_device_view_form" model="ir.ui.view">
<field name="name">定位装置型号</field>
<field name="model">sf.fixture.locating.device</field>
<field name="arch" type="xml">
<form string="定位装置型号">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="locating_device_type_id"/>
<field name="brand_id"/>
</group>
<group>
<field name="picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
<field name="length"/>
<field name="width"/>
<field name="height"/>
<field name="diameter"/>
</group>
<group>
<field name="material_type_id"/>
<field name="weight"/>
<field name="max_bearing_capacity"/>
<field name="accuracy_grade"/>
<field name="locate_mode_ids"/>
</group>
</group>
<group string="其他">
<group>
<field name="comment"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_fixture_locating_device_view_act" model="ir.actions.act_window">
<field name="name">定位装置型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.fixture.locating.device</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ==========================================定位装置类型view视图=============================================== -->
<record id="sf_locating_device_type_view_tree" model="ir.ui.view">
<field name="name">定位装置类型</field>
<field name="model">sf.locating.device.type</field>
<field name="arch" type="xml">
<tree string="定位装置类型">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_locating_device_type_view_form" model="ir.ui.view">
<field name="name">定位装置类型</field>
<field name="model">sf.locating.device.type</field>
<field name="arch" type="xml">
<form string="定位装置类型">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_locating_device_type_view_act" model="ir.actions.act_window">
<field name="name">定位装置类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.locating.device.type</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ====================================定位装置定位方式view视图========================================== -->
<record id="sf_locating_device_locate_mode_view_tree" model="ir.ui.view">
<field name="name">定位装置定位方式</field>
<field name="model">sf.locating.device.locate.mode</field>
<field name="arch" type="xml">
<tree string="定位装置定位方式">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_locating_device_locate_mode_view_form" model="ir.ui.view">
<field name="name">定位装置定位方式</field>
<field name="model">sf.locating.device.locate.mode</field>
<field name="arch" type="xml">
<form string="定位装置定位方式">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name_id"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_locating_device_locate_mode_view_act" model="ir.actions.act_window">
<field name="name">定位装置定位方式</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.locating.device.locate.mode</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ======================================导向元件view视图=========================================== -->
<record id="sf_fixture_guide_element_view_tree" model="ir.ui.view">
<field name="name">导向元件型号</field>
<field name="model">sf.fixture.guide.element</field>
<field name="arch" type="xml">
<tree string="导向元件型号">
<field name="code"/>
<field name="name"/>
<field name="guide_ele_type_id"/>
<field name="brand_id"/>
<field name="picture" widget="image"/>
</tree>
</field>
</record>
<record id="sf_fixture_guide_element_view_form" model="ir.ui.view">
<field name="name">导向元件型号</field>
<field name="model">sf.fixture.guide.element</field>
<field name="arch" type="xml">
<form string="导向元件型号">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="guide_ele_type_id"/>
<field name="brand_id"/>
</group>
<group>
<field name="picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
<field name="length"/>
<field name="width"/>
<field name="height"/>
<field name="diameter"/>
<field name="guide_ele_way_to_install_id"/>
</group>
<group>
<field name="material_type_id"/>
<field name="accuracy_grade"/>
<field name="weight"/>
<field name="scope_of_application"/>
<field name="guide_ele_guide_mode_id"/>
</group>
</group>
<group string="其他">
<group>
<field name="comment"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_fixture_guide_element_view_act" model="ir.actions.act_window">
<field name="name">导向元件型号</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.fixture.guide.element</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ========================================导向元件类型view视图==================================== -->
<record id="sf_guide_element_type_view_tree" model="ir.ui.view">
<field name="name">导向元件类型</field>
<field name="model">sf.guide.element.type</field>
<field name="arch" type="xml">
<tree string="定位原件类型">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_guide_element_type_view_form" model="ir.ui.view">
<field name="name">导向元件类型</field>
<field name="model">sf.guide.element.type</field>
<field name="arch" type="xml">
<form string="定位元件类型">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_guide_element_type_view_act" model="ir.actions.act_window">
<field name="name">导向元件类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.guide.element.type</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ==========================================导向元件导向方式view视图======================================== -->
<record id="sf_guide_element_guide_mode_view_tree" model="ir.ui.view">
<field name="name">导向元件导向方式</field>
<field name="model">sf.guide.element.guide.mode</field>
<field name="arch" type="xml">
<tree string="导向元件导向方式">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_guide_element_guide_mode_view_form" model="ir.ui.view">
<field name="name">导向元件导向方式</field>
<field name="model">sf.guide.element.guide.mode</field>
<field name="arch" type="xml">
<form string="导向元件导向方式">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name_id"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_guide_element_guide_mode_view_act" model="ir.actions.act_window">
<field name="name">导向元件导向方式</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.guide.element.guide.mode</field>
<field name="view_mode">tree,form</field>
</record>
<!-- ==========================================导向元件安装方式view视图============================================== -->
<record id="sf_guide_element_way_to_install_view_tree" model="ir.ui.view">
<field name="name">导向元件安装方式</field>
<field name="model">sf.guide.element.way.to.install</field>
<field name="arch" type="xml">
<tree string="导向元件导向方式">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_guide_element_way_to_install_view_form" model="ir.ui.view">
<field name="name">导向元件安装方式</field>
<field name="model">sf.guide.element.way.to.install</field>
<field name="arch" type="xml">
<form string="导向元件导向方式">
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name_id"/>
</group>
<group>
<field name="name"/>
</group>
</group>
<group string="其他">
<field name="comment"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_guide_element_way_to_install_view_act" model="ir.actions.act_window">
<field name="name">导向元件安装方式</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.guide.element.way.to.install</field>
<field name="view_mode">tree,form</field>
</record>
</odoo>

View File

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!--<menuitem id="menu_sf_functional_fixture_list_1"-->
<!-- name="功能夹具列表"-->
<!-- sequence="0"-->
<!-- />-->
<menuitem id="menu_sf_functional_fixture_list_2"
name="夹具"
parent="menu_sf_base"
sequence="70"
/>
<!-- <menuitem id="menu_sf_functional_fixture_list_3"-->
<!-- name="类型列表"-->
<!-- parent="menu_sf_functional_fixture_list_1"-->
<!-- sequence="0"-->
<!-- />-->
<menuitem id="menu_sf_fixture_setting_element_1"
name="定位元件型号"
parent="menu_sf_functional_fixture_list_2"
sequence="0"
action="sf_fixture_setting_element_view_act"
/>
<menuitem id="menu_sf_setting_element_type_1"
name="定位元件类型"
parent="menu_sf_functional_fixture_list_2"
sequence="10"
action="sf_setting_element_type_view_act"
/>
<menuitem id="menu_sf_fixture_clamping_element_1"
name="夹紧元件型号"
parent="menu_sf_functional_fixture_list_2"
sequence="2"
action="sf_fixture_clamping_element_view_act"
/>
<menuitem id="menu_sf_clamping_element_type_1"
name="夹紧元件类型"
parent="menu_sf_functional_fixture_list_2"
sequence="12"
action="sf_clamping_element_type_view_act"
/>
<menuitem id="menu_sf_fixture_tool_setting_1"
name="对刀夹具型号"
parent="menu_sf_functional_fixture_list_2"
sequence="4"
action="sf_fixture_tool_setting_view_act"
/>
<menuitem id="menu_sf_tool_setting_type_1"
name="对刀夹具类型"
parent="menu_sf_functional_fixture_list_2"
sequence="14"
action="sf_tool_setting_type_view_act"
/>
<menuitem id="menu_sf_fixture_locating_device_1"
name="定位装置型号"
parent="menu_sf_functional_fixture_list_2"
sequence="6"
action="sf_fixture_locating_device_view_act"
/>
<menuitem id="menu_sf_locating_device_type_1"
name="定位装置型号"
parent="menu_sf_functional_fixture_list_2"
sequence="16"
action="sf_locating_device_type_view_act"
/>
<menuitem id="menu_sf_locating_device_locate_mode_1"
name="定位装置定位方式"
parent="menu_sf_functional_fixture_list_2"
sequence="18"
action="sf_locating_device_locate_mode_view_act"
/>
<menuitem id="menu_sf_fixture_guide_element_1"
name="导向元件型号"
parent="menu_sf_functional_fixture_list_2"
sequence="8"
action="sf_fixture_guide_element_view_act"
/>
<menuitem id="menu_sf_guide_element_type_1"
name="导向元件类型"
parent="menu_sf_functional_fixture_list_2"
sequence="20"
action="sf_guide_element_type_view_act"
/>
<menuitem id="menu_sf_guide_element_guide_mode_1"
name="导向元件导向方式"
parent="menu_sf_functional_fixture_list_2"
sequence="22"
action="sf_guide_element_guide_mode_view_act"
/>
<menuitem id="menu_sf_guide_element_way_to_install_1"
name="导向元件安装方式"
parent="menu_sf_functional_fixture_list_2"
sequence="24"
action="sf_guide_element_way_to_install_view_act"
/>
</odoo>

View File

@@ -127,26 +127,6 @@
sequence="1"
action="action_sf_machine_tool_category"/>
<menuitem
id="menu_sf_cutting_tool"
parent="mrp.menu_mrp_configuration"
name="刀具"
sequence="5"/>
<menuitem
id="menu_sf_cutting_tool_category"
parent="menu_sf_cutting_tool"
name="刀具类别"
sequence="1"
action="action_sf_cutting_tool_category"/>
<menuitem
id="menu_sf_cutting_tool_type"
parent="menu_sf_cutting_tool"
name="刀具型号"
sequence="1"
action="action_sf_cutting_tool_type"/>
<menuitem
id="menu_sf_machine_control_system"
parent="menu_sf_base"

View File

@@ -11,7 +11,7 @@
</record>
<!-- 功能刀具action -->
<record id="action_sf_functional_cutting_tool" model="ir.actions.act_window">
<field name="name">功能刀具型号</field>
<field name="name">功能刀具</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.cutting.tool</field>
<field name="view_mode">tree,form</field>
@@ -100,17 +100,15 @@
<field name="res_model">sf.chuck.model</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具物料action -->
<record id="action_sf_cutting_tool_material" model="ir.actions.act_window">
<field name="name">刀具物料</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting.tool.material</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool" -->
<!-- parent="mrp.menu_mrp_configuration" -->
<!-- name="刀具" -->
<!-- sequence="3" -->
<!-- /> -->
<!-- 功能刀具 -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- 功能刀具 -->
<menuitem
id="menu_sf_functional_cutting_tool"
parent="menu_sf_base"
@@ -118,21 +116,15 @@
sequence="3"
action="action_sf_functional_cutting_tool"
/>
<!-- --><!-- 刀具物料 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_material" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀具物料" -->
<!-- sequence="1" -->
<!-- /> -->
<!-- 刀具物料 -->
<menuitem
id="menu_sf_cutting_tool_material"
parent="menu_sf_base"
name="刀具物料"
sequence="1"
action="action_sf_cutting_tool_material"
/>
<!-- --><!-- 刀头 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_head" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀头" -->
<!-- sequence="2" -->
<!-- /> -->
<!-- 整体式刀具 -->
<menuitem
@@ -238,7 +230,5 @@
sequence="64"
action="action_sf_cutting_tool_clamp_head_type"
/>
</data>
</odoo>

View File

@@ -1,6 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data>
<!-- 刀具物料tree view -->
<record id="view_cutting_tool_material_tree" model="ir.ui.view">
<field name="name">sf.cutting.tool.material.tree</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<tree string="刀具物料">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
</tree>
</field>
</record>
<!-- 刀具物料form view -->
<record id="view_cutting_tool_material_form" model="ir.ui.view">
<field name="name">sf.cutting.tool.material.form</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<form string="刀具物料">
<sheet>
<group col='1'>
<group string='基本信息'>
<group>
<field name="code"/>
<field name="name"/>
</group>
<group>
<field name="remark"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>
<!-- 刀具物料search view -->
<record model="ir.ui.view" id="view_cutting_tool_material_search">
<field name="name">sf.cutting.tool.material.search</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<search string="刀具物料">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 功能刀具tree view -->
<record id="view_functional_cutting_tool_tree" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.tree</field>
@@ -82,6 +128,17 @@
</form>
</field>
</record>
<!-- 功能刀具search view -->
<record model="ir.ui.view" id="view_sf_functional_cutting_tool_search">
<field name="name">sf.functional.cutting.tool.search</field>
<field name="model">sf.functional.cutting.tool</field>
<field name="arch" type="xml">
<search string="功能刀具">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 整体式刀具tree view -->
<record id="view_integral_cutting_tool_tree" model="ir.ui.view">
@@ -113,6 +170,7 @@
<field name="name"/>
<field name="integral_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -126,6 +184,8 @@
<field name="blade_length"/>
<field name="diameter"/>
<field name="blade_number"/>
<field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="front_angle"/>
@@ -137,17 +197,28 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<group>
<field name="scope"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>
<!-- 整体式刀具search view -->
<record model="ir.ui.view" id="view_integral_cutting_tool_search">
<field name="name">sf.integral.cutting.tool.search</field>
<field name="model">sf.integral.cutting.tool</field>
<field name="arch" type="xml">
<search string="整体式刀具">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀片tree -->
<record id="view_blade_tree" model="ir.ui.view">
<field name="name">sf.blade.tree</field>
@@ -176,6 +247,7 @@
<field name="name"/>
<field name="blade_model_number"/>
<field name="brand" options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -189,7 +261,8 @@
<field name="height"/>
<field name="top_angle"/>
<field name="front_angle"/>
<field name="rear_angle"/>
<field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="main_included_angle"/>
@@ -197,15 +270,12 @@
<field name="material_model"/>
<field name="hardness"/>
<field name="radius"/>
<field name="rear_angle"/>
</group>
</group>
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
</group>
@@ -213,6 +283,17 @@
</form>
</field>
</record>
<!-- 刀片search view -->
<record model="ir.ui.view" id="view_blade_search">
<field name="name">sf.blade.search</field>
<field name="model">sf.blade</field>
<field name="arch" type="xml">
<search string="刀片">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀杆tree -->
<record id="view_cutter_bar_tree" model="ir.ui.view">
<field name="name">sf.cutter.bar.tree</field>
@@ -241,6 +322,9 @@
<field name="name"/>
<field name="cutter_bar_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -269,7 +353,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
@@ -278,6 +361,17 @@
</form>
</field>
</record>
<!-- 刀杆search view -->
<record model="ir.ui.view" id="view_cutter_bar_search">
<field name="name">sf.cutter.bar.search</field>
<field name="model">sf.cutter.bar</field>
<field name="arch" type="xml">
<search string="刀杆">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀盘tree -->
<record id="view_cutter_pad_tree" model="ir.ui.view">
@@ -307,6 +401,9 @@
<field name="name"/>
<field name="cutter_pad_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -334,7 +431,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
</group>
@@ -342,6 +438,17 @@
</form>
</field>
</record>
<!-- 刀盘search view -->
<record model="ir.ui.view" id="view_cutter_pad_search">
<field name="name">sf.cutter.pad.search</field>
<field name="model">sf.cutter.pad</field>
<field name="arch" type="xml">
<search string="刀盘">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀柄tree -->
<record id="view_cutter_handle_tree" model="ir.ui.view">
@@ -371,6 +478,9 @@
<field name="name"/>
<field name="handle_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -396,7 +506,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -408,6 +517,17 @@
</form>
</field>
</record>
<!-- 刀柄search view -->
<record model="ir.ui.view" id="view_handle_search">
<field name="name">sf.handle.search</field>
<field name="model">sf.handle</field>
<field name="arch" type="xml">
<search string="刀柄">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 夹头tree -->
<record id="view_cutter_chuck_tree" model="ir.ui.view">
@@ -437,6 +557,9 @@
<field name="name"/>
<field name="chuck_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="handle_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -459,7 +582,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="handle_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -471,6 +593,17 @@
</form>
</field>
</record>
<!-- 夹头search view -->
<record model="ir.ui.view" id="view_chuck_search">
<field name="name">sf.chuck.search</field>
<field name="model">sf.chuck</field>
<field name="arch" type="xml">
<search string="夹头">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 功能刀具类型tree -->
<record id="view_cutter_function_tree" model="ir.ui.view">
@@ -529,6 +662,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -562,7 +696,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="blade_ids"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -596,6 +730,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -629,6 +764,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -663,6 +799,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -696,6 +833,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -705,7 +843,5 @@
</form>
</field>
</record>
</data>
</odoo>