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

优化产品页面

Browse Source
This commit is contained in:
jinling.yang
2024-03-13 17:34:35 +08:00
parent 0c44bba5f2
commit 5e0b4aa509
7 changed files with 131 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/tool_base_new.py
View File

@@ -126,7 +126,7 @@ class CuttingToolModel(models.Model):
else: else:
m = int(today_code[-3:]) + 1 m = int(today_code[-3:]) + 1
num = "%03d" % m num = "%03d" % m
return "%s%s" % (today_code, num) self.code = "%s%s" % (today_code, num)
# 适用夹头型号可以多选 # 适用夹头型号可以多选
# chuck_ids = fields.Many2many( # chuck_ids = fields.Many2many(

1
sf_base/models/tool_other_features.py
View File

@@ -31,6 +31,7 @@ class ToolMaterialsBasicParameters(models.Model):
blade_depth = fields.Float('刃部深度(mm)') blade_depth = fields.Float('刃部深度(mm)')
pitch = fields.Float('牙距(mm)') pitch = fields.Float('牙距(mm)')
cutting_depth = fields.Float('切削深度(mm)') cutting_depth = fields.Float('切削深度(mm)')
cutting_depth_max = fields.Float('最大切削深度(mm)')
# 刀片参数 # 刀片参数
length = fields.Float('长度(mm)') length = fields.Float('长度(mm)')
thickness = fields.Float('厚度(mm)') thickness = fields.Float('厚度(mm)')

139
sf_base/views/tool_basic_param.xml
View File

@@ -124,52 +124,143 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="规则"> <form string="规则">
<sheet> <sheet>
<field name="cutting_tool_type"/> <field name="cutting_tool_type" invisible="0"/>
<field name="standard_library_id"/> <field name="standard_library_id" invisible="1"/>
<group> <group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"> <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
<field name="total_length"/> <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"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
<field name="blade_diameter"/> <field name="blade_diameter"/>
<field name="blade_length"/> <field name="blade_length"/>
<field name="blade_number"/>
<field name="neck_length"/>
<field name="neck_diameter"/>
<field name="handle_diameter"/>
<field name="handle_length"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
<field name="blade_tip_working_size"/>
<field name="blade_tip_diameter"/>
<field name="blade_tip_taper"/>
<field name="blade_helix_angle"/> <field name="blade_helix_angle"/>
<field name="blade_width"/>
<field name="blade_width"/>
<field name="pitch"/> <field name="pitch"/>
<field name="cutting_depth"/> <field name="blade_width"/>
<field name="blade_depth"/>
<field name="cutting_depth_max"/>
</group> </group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"> <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
<field name="total_length"/>
<field name="length"/> <field name="length"/>
<field name="thickness"/> <field name="thickness"/>
<field name="width"/> <field name="inscribed_circle_tolerance"/>
<field name="install_aperture_diameter"/>
<field name="blade_tip_circular_arc_radius"/>
<field name="cutting_blade_length"/> <field name="cutting_blade_length"/>
<field name="relief_angle"/> <field name="relief_angle"/>
<field name="blade_tip_circular_arc_radius"/>
<field name="inscribed_circle_diameter"/>
<field name="install_aperture_diameter"/>
<field name="chip_breaker_groove"/> <field name="chip_breaker_groove"/>
<field name="blade_teeth_model"/> <field name="chip_breaker_type_code"/>
<field name="blade_blade_number"/>
</group> </group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"> <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
<field name="blade_teeth_model"/>
<field name="thread_model"/>
<field name="pitch"/>
<field name="thread_num"/>
<field name="cutting_depth_max"/>
<field name="blade_blade_number" string="刃数"/>
<field name="blade_width" string="刃宽"/>
<field name="main_included_angle"/> <field name="main_included_angle"/>
<field name="top_angle"/> <field name="top_angle"/>
<field name="thread_model"/>
<field name="thread_num"/>
<field name="blade_tip_height_tolerance"/> <field name="blade_tip_height_tolerance"/>
<field name="inscribed_circle_tolerance"/> <field name="inscribed_circle_tolerance"/>
<field name="thickness_tolerance"/> <field name="thickness_tolerance"/>
</group> </group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
<field name="total_length"/>
<field name="width"/>
<field name="height"/>
<field name="knife_head_length"/>
<field name="knife_head_height"/>
<field name="knife_head_width"/>
<field name="blade_diameter"/>
<field name="cutter_arbor_diameter"/>
<field name="is_cooling_hole"/>
<field name="locating_slot_code"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
<field name="main_included_angle"/>
<field name="top_angle"/>
<field name="cutting_blade_length"/>
<field name="cutting_depth_max"/>
<field name="min_machining_aperture"/>
<field name="install_blade_tip_num"/>
<field name="installing_structure"/>
<field name="blade_id"/>
<field name="tool_shim"/>
<field name="cotter_pin"/>
<field name="pressing_plate"/>
<field name="screw"/>
<field name="spanner"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
<field name="blade_diameter"/>
<field name="cutter_head_diameter"/>
<field name="interface_diameter"/>
<field name="install_blade_tip_num"/>
<field name="total_length"/>
<field name="blade_length"/>
<field name="cutting_blade_length"/>
<field name="cutting_depth"/>
<field name="main_included_angle"/>
<field name="installing_structure"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
<field name="installing_structure"/>
<field name="blade_id"/>
<field name="tool_shim"/>
<field name="screw"/>
<field name="spanner"/>
<field name="is_cooling_hole"/>
<field name="locating_slot_code"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
<field name="er_size_model"/>
<field name="min_clamping_diameter"/>
<field name="max_clamping_diameter"/>
<field name="total_length"/>
<field name="outer_diameter"/>
<field name="inner_diameter"/>
<field name="taper"/>
<field name="top_diameter"/>
<field name="weight"/>
<field name="max_load_capacity"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
<field name="cooling_jacket"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
<field name="taper_shank_model"/>
<field name="total_length"/>
<field name="shank_length"/>
<field name="shank_diameter"/>
<field name="flange_shank_length"/>
<field name="flange_diameter"/>
<field name="diameter_slip_accuracy"/>
<field name="dynamic_balance_class"/>
<field name="min_clamping_diameter"/>
<field name="max_clamping_diameter"/>
</group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
<field name="max_rotate_speed"/>
<field name="fit_chuck_size"/>
<field name="nut"/>
<field name="spanner"/>
<field name="clamping_mode"/>
<field name="tool_changing_time"/>
<field name="cooling_model"/>
<field name="is_quick_cutting"/>
<field name="is_safe_lock"/>
</group>
</group> </group>
</sheet> </sheet>
</form> </form>

1
sf_base/views/tool_menu.xml
View File

@@ -21,6 +21,7 @@
<field name="name">刀具标准库</field> <field name="name">刀具标准库</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting_tool.standard.library</field> <field name="res_model">sf.cutting_tool.standard.library</field>
<!-- <field name="context">{'default_cutting_tool_material_id': cutting_tool_material_id}</field>-->
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<!-- 功能刀具action --> <!-- 功能刀具action -->

9
sf_base/views/tool_views.xml
View File

@@ -126,14 +126,14 @@
options="{'zoom': true, 'preview_image':'image_128'}" required="1"/> options="{'zoom': true, 'preview_image':'image_128'}" required="1"/>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="code"/> <field name="code" readonly="1"/>
</h1> </h1>
</div> </div>
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
<field name="cutting_tool_material_id"/> <field name="cutting_tool_material_id" readonly="1"/>
<field name="cutting_tool_type" readonly="1"/> <field name="cutting_tool_type" invisible="1"/>
<field name="cutting_tool_type_id" required="1"/> <field name="cutting_tool_type_id" required="1"/>
<field name="brand_id" required="1"/> <field name="brand_id" required="1"/>
<label for="integral_run_out_accuracy_min" string="端跳精度" <label for="integral_run_out_accuracy_min" string="端跳精度"
@@ -165,8 +165,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/> attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
</group> </group>
<group> <group>
<field name="material_model_id" placeholder="请选择" string="材质" <field name="material_model_id" placeholder="请选择" string="材质"/>
attrs="{'required': [('cutting_tool_type', 'not in', ['刀柄', '夹头'])]}"/>
<field name="tool_hardness" string="硬度(hrc)" options="{'format': false}" <field name="tool_hardness" string="硬度(hrc)" options="{'format': false}"
widget="integer"/> widget="integer"/>
<field name="coating_material"/> <field name="coating_material"/>

9
sf_dlm_management/views/product_template_management_view.xml
View File

@@ -15,7 +15,7 @@
attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('is_bfm','=', True)]}"/> attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('is_bfm','=', True)]}"/>
<field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1" <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/> attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/>
<field name='cutting_tool_type'/> <field name='cutting_tool_type' invisible="1"/>
<field name="fixture_material_type" invisible="1"/> <field name="fixture_material_type" invisible="1"/>
<field name="embryo_model_type_id" string="模型类型" options="{'no_create': True}" <field name="embryo_model_type_id" string="模型类型" options="{'no_create': True}"
attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/> attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/>
@@ -34,9 +34,12 @@
<field name="cutting_tool_model_id" placeholder="请选择" class="custom_required" <field name="cutting_tool_model_id" placeholder="请选择" class="custom_required"
domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]" domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"
context="{'default_cutting_tool_material_id': cutting_tool_material_id}" context="{'default_cutting_tool_material_id': cutting_tool_material_id}"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"/> attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}">
</field>
<!-- <button name="%(sf_base.action_sf_cutting_tool_standard_library)d" string="新建" type="action"-->
<!-- context="{'default_cutting_tool_material_id': cutting_tool_material_id}"/>-->
<field name="specification_id" placeholder="请选择" class="custom_required" <field name="specification_id" placeholder="请选择" class="custom_required"
context="{'default_cutting_tool_type': cutting_tool_type}" context="{'default_cutting_tool_type': cutting_tool_type,'default_standard_library_id':cutting_tool_model_id}"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}" attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
domain="[('standard_library_id','=',cutting_tool_model_id)]"/> domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
<field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}" <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"

6
sf_manufacturing/models/product_template.py
View File

@@ -103,9 +103,9 @@ class ResProductMo(models.Model):
compaction_way_id = fields.Many2one('maintenance.equipment.image', compaction_way_id = fields.Many2one('maintenance.equipment.image',
'压紧方式', domain=[('type', '=', '压紧方式')]) '压紧方式', domain=[('type', '=', '压紧方式')])
@api.onchange('cutting_tool_model_id') # @api.onchange('cutting_tool_model_id')
def _onchange_cutting_tool_model_id(self): # def _onchange_cutting_tool_model_id(self):
self.specification_id = False # self.specification_id = False
@api.onchange('cutting_tool_material_id') @api.onchange('cutting_tool_material_id')
def _onchange_cutting_tool_material_id(self): def _onchange_cutting_tool_material_id(self):