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-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
sf_base/views/base_view.xml
View File

@@ -91,66 +91,88 @@
<field name="name"/>
<field name="brand_id"/>
<field name="remark"/>
<field name="machine_tool_picture" widget="image"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="form_sf_machine_tool_type">
<record model="ir.ui.view" id="form_sf_machine_tool_type">
<field name="name">form.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<form string="机床型号">
<group string="基本信息" name="base_info">
<group>
<field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/>
</group>
<group>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/>
</group>
</group>
<field name="machine_tool_picture" widget="image"/>
<group string="基本信息">
<group>
<field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/>
</group>
<group>
<field name="machine_tool_category"/>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}" />
</group>
</group>
<group string="参数">
<group>
<field name="knife_type" required="1"/>
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
<field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
<label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="o_address_format"
attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="x_axis" string="x"/>
<field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
<label for="y_axis" string="y"/>
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<label for="z_axis" string="z"/>
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_city" required="1"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
options="{'format': false}"/>
<label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
options="{'format': false}"/>
</div>
</group>
<group>
<field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/>
<field name="precision" required="1" string="加工精度(mm)"/>
<field name="control_system_id" required="1" options="{'no_create': True}"/>
</group>
</group>
<group>
<field name="control_system_id" required="1" options="{'no_create': True}" />
<field name="workbench_L" required="1"/>
<field name="workbench_W" required="1"/>
<field name="machine_tool_L" required="1"/>
<field name="machine_tool_W" required="1"/>
<field name="machine_tool_H" required="1"/>
<field name="knife_type" required="1"/>
<field name="workpiece_load" required="1"/>
<field name="lead_screw" required="1"/>
<field name="taper" required="1"/>
<field name="torque" required="1"/>
<field name="motor_power" required="1"/>
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
<field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
<label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="test_model"
attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="x_axis" string="x"/>
<field name="x_axis" class="o_address_zip" required="1" options="{'format': false}" />
<span>&amp;nbsp;</span>
<label for="y_axis" string="y"/>
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}" />
<span>&amp;nbsp;</span>
<label for="z_axis" string="z"/>
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}" />
<br></br>
<label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" options="{'format': false}" />
<span>&amp;nbsp;</span>
<label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}" options="{'format': false}" />
</div>
</group>
<group>
<field name="heightened_way" required="1"/>
<field name="tool_quality_max" required="1"/>
<field name="tool_long_max" required="1"/>
<field name="tool_diameter_max" required="1"/>
<field name="guide_rail" required="1"/>
<field name="feed_speed" required="1"/>
<field name="tool_speed" required="1"/>
<field name="distance" required="1"/>
<field name="rotate_speed" string="主轴转速(min)" required="1" options="{'format': false}"/>
<field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
</group>
</group>
<group string="其它">
<field name="remark"/>
</group>
</form>
</field>
</record>
@@ -169,6 +191,70 @@
</field>
</record>
#------------------机床类型------------------
<record model="ir.ui.view" id="search_sf_machine_tool_category_view">
<field name="name">search.sf.machine_tool.category</field>
<field name="model">sf.machine_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_machine_tool_category_view">
<field name="name">tree.sf.machine_tool.category</field>
<field name="model">sf.machine_tool.category</field>
<field name="arch" type="xml">
<tree string="机床类型">
<field name="code"/>
<field name="name"/>
<field name="category"/>
<field name="remark"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="form_sf_machine_tool_category">
<field name="name">form.sf.machine_tool.category</field>
<field name="model">sf.machine_tool.category</field>
<field name="arch" type="xml">
<form string="机床类型">
<group string="基本信息" name="base_info">
<group>
<field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/>
</group>
<group>
<field name="category" readonly="1"/>
</group>
</group>
<group string="其它">
<field name="remark"/>
</group>
</form>
</field>
</record>
<record id="action_sf_machine_tool_category" model="ir.actions.act_window">
<field name="name">机床类型</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.machine_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>
#------------------刀具型号------------------
<record model="ir.ui.view" id="search_sf_cutting_tool_type_view">

6
sf_base/views/menu_view.xml
View File

@@ -120,6 +120,12 @@
name="机床型号"
sequence="1"
action="action_sf_machine_tool_type"/>
<menuitem
id="menu_sf_machine_tool_category"
parent="menu_sf_base"
name="机床类型"
sequence="1"
action="action_sf_machine_tool_category"/>
<menuitem
id="menu_sf_cutting_tool"