Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步
This commit is contained in:
jinling.yang
@@ -149,6 +149,8 @@
|
||||
options="{'format': false}"/>
|
||||
<span>(mm)&nbsp;</span>
|
||||
</div>
|
||||
<field name="ramping_angle_ids" widget="many2many_tags"
|
||||
attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
|
||||
<field name="cutter_bar_ids" widget="many2many_tags"
|
||||
options="{'no_create': True}" search="[]"
|
||||
attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
|
||||
@@ -274,7 +276,7 @@
|
||||
<field name="min_machining_aperture" class="diameter"/>
|
||||
<field name="install_blade_tip_num"/>
|
||||
<field name="cutting_blade_model"/>
|
||||
<field name="is_cooling_hole" />
|
||||
<field name="is_cooling_hole"/>
|
||||
<field name="locating_slot_code"/>
|
||||
<field name="installing_structure"/>
|
||||
<field name="blade_id" placeholder="请选择"/>
|
||||
@@ -304,7 +306,7 @@
|
||||
<field name="screw"/>
|
||||
<field name="spanner"/>
|
||||
<field name="cutting_blade_model"/>
|
||||
<field name="is_cooling_hole" />
|
||||
<field name="is_cooling_hole"/>
|
||||
<field name="locating_slot_code"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -327,11 +329,11 @@
|
||||
<field name="max_rotate_speed"/>
|
||||
<field name="diameter_slip_accuracy"/>
|
||||
<field name="cooling_model"/>
|
||||
<field name="is_rough_machining" />
|
||||
<field name="is_finish_machining" />
|
||||
<field name="is_quick_cutting" />
|
||||
<field name="is_drill_hole" />
|
||||
<field name="is_safe_lock" />
|
||||
<field name="is_rough_machining"/>
|
||||
<field name="is_finish_machining"/>
|
||||
<field name="is_quick_cutting"/>
|
||||
<field name="is_drill_hole"/>
|
||||
<field name="is_safe_lock"/>
|
||||
<field name="screw"/>
|
||||
<field name="spanner"/>
|
||||
</tree>
|
||||
@@ -363,23 +365,21 @@
|
||||
<page string="切削速度Vc"
|
||||
attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
|
||||
<field name="cutting_speed_ids">
|
||||
<tree editable="bottom" class="center" delete="1">
|
||||
<tree editable="bottom" class="center mrs_cutting_speed_tree" delete="1">
|
||||
<field name="execution_standard_id" placeholder="请选择" required="1"/>
|
||||
<field name="material_code" readonly="1"/>
|
||||
<field name="material_id" placeholder="请选择"
|
||||
attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
|
||||
<field name="material_name_id" placeholder="请选择"
|
||||
attrs="{'readonly': [('execution_standard_id', '=', False)],
|
||||
'required': [('execution_standard_id', '!=', False)]}"/>
|
||||
<field name="material_grade" readonly="1"/>
|
||||
<field name="tensile_strength" readonly="1"/>
|
||||
<field name="hardness" readonly="1"/>
|
||||
<field name="slope_milling_angle" widget="du"/>
|
||||
<field name="cutting_speed_n1"/>
|
||||
<field name="cutting_speed_n2"/>
|
||||
<field name="cutting_speed_n3"/>
|
||||
<field name="cutting_speed_n4"/>
|
||||
<field name="cutting_speed_n5"/>
|
||||
<field name="rough_machining"/>
|
||||
<field name="precision_machining"/>
|
||||
<field name="application" placeholder="请选择" required="1"/>
|
||||
<field name="ability_feature_library"/>
|
||||
<field name="cutting_width_depth_id"/>
|
||||
<field name="process_capability"/>
|
||||
<field name="cutting_speed"/>
|
||||
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
@@ -388,33 +388,18 @@
|
||||
<field name="feed_per_tooth_ids"
|
||||
attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
|
||||
<tree editable="bottom" class="center" create="0" delete="0">
|
||||
<field name="cutting_speed"/>
|
||||
<field name="blade_diameter"/>
|
||||
<field name="feed_per_tooth" required="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="feed_per_tooth_ids_2"
|
||||
attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
|
||||
<tree editable="bottom" class="center" create="0" delete="0">
|
||||
<field name="machining_method"/>
|
||||
<field name="cutting_width_depth_id"/>
|
||||
<field name="materials_type_id"/>
|
||||
<field name="blade_diameter"/>
|
||||
<field name="feed_per_tooth" required="1"/>
|
||||
<field name="feed_per_tooth"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="feed_per_tooth_ids_3"
|
||||
attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
|
||||
<tree editable="bottom" class="center" create="0" delete="0">
|
||||
<field name="cutting_speed"/>
|
||||
<field name="feed_per_tooth" required="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="feed_per_tooth_ids_4"
|
||||
attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
|
||||
<tree editable="bottom" class="center" create="0" delete="0">
|
||||
<field name="machining_method"/>
|
||||
<field name="cutting_width_depth_id"/>
|
||||
<field name="materials_type_id"/>
|
||||
<field name="feed_per_tooth" required="1"/>
|
||||
<field name="feed_per_tooth"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
@@ -507,34 +492,31 @@
|
||||
<field name="domain">[]</field>
|
||||
</record>
|
||||
|
||||
<!-- ================================================刀具基础参数================================================ -->
|
||||
<!-- <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
|
||||
<!-- <field name="name">sf.tool.materials.basic.parameters.tree</field>-->
|
||||
<!-- <field name="model">sf.tool.materials.basic.parameters</field>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <tree string="基础参数" delete="0" create="0">-->
|
||||
<!-- <field name="total_length" />-->
|
||||
<!-- <field name="blade_number" />-->
|
||||
<!-- <field name="neck_diameter"/>-->
|
||||
<!-- <field name="neck_length"/>-->
|
||||
<!-- <field name="handle_diameter" />-->
|
||||
<!-- <field name="handle_length" />-->
|
||||
<!-- <field name="blade_tip_diameter"/>-->
|
||||
<!-- <field name="blade_tip_working_size"/>-->
|
||||
<!-- <field name="blade_tip_taper" />-->
|
||||
<!-- <field name="blade_diameter" />-->
|
||||
<!-- <field name="blade_length"/>-->
|
||||
<!-- <field name="blade_helix_angle"/>-->
|
||||
<!-- <field name="blade_width" />-->
|
||||
<!-- <field name="blade_width" />-->
|
||||
<!-- <field name="pitch"/>-->
|
||||
<!-- <field name="cutting_depth"/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
|
||||
|
||||
<!-- ================================================刀具基础参数================================================ -->
|
||||
<!-- <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
|
||||
<!-- <field name="name">sf.tool.materials.basic.parameters.tree</field>-->
|
||||
<!-- <field name="model">sf.tool.materials.basic.parameters</field>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <tree string="基础参数" delete="0" create="0">-->
|
||||
<!-- <field name="total_length" />-->
|
||||
<!-- <field name="blade_number" />-->
|
||||
<!-- <field name="neck_diameter"/>-->
|
||||
<!-- <field name="neck_length"/>-->
|
||||
<!-- <field name="handle_diameter" />-->
|
||||
<!-- <field name="handle_length" />-->
|
||||
<!-- <field name="blade_tip_diameter"/>-->
|
||||
<!-- <field name="blade_tip_working_size"/>-->
|
||||
<!-- <field name="blade_tip_taper" />-->
|
||||
<!-- <field name="blade_diameter" />-->
|
||||
<!-- <field name="blade_length"/>-->
|
||||
<!-- <field name="blade_helix_angle"/>-->
|
||||
<!-- <field name="blade_width" />-->
|
||||
<!-- <field name="blade_width" />-->
|
||||
<!-- <field name="pitch"/>-->
|
||||
<!-- <field name="cutting_depth"/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user