Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
141 changed files with 20125 additions and 4856 deletions

View File

@@ -173,13 +173,16 @@
<group string="基本信息">
<group>
<field name="code" force_save="1"/>
<field name="name"/>
<field name="brand_id"/>
<field name="fixture_material_id"/>
<field name="fixture_material_type" invisible="1"/>
<field name="multi_mounting_type_id"/>
</group>
<group>
<field name="name"/>
<field name="fixture_material_id"/>
<field name="fixture_material_type" invisible="1"/>
<!-- <field name="upload_model_file" widget="many2many_binary"/>-->
<field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
attrs="{'invisible': [('model_file', '=', False)]}"/>
</group>
</group>
<group string="参数"
@@ -222,7 +225,7 @@
<field name="clamp_workpiece_diameter_max"
attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
<field name="maximum_carrying_weight"></field>
<field name="Maximum_clamping_force"></field>
<field name="maximum_clamping_force"></field>
</group>
<group>
<field name="materials_model_id"/>
@@ -238,7 +241,6 @@
attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
<field name="apply_machine_tool_type"
attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
<field name="model_file"/>
</group>
</group>
</sheet>