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

Merge branch 'feature/优化产品模版' into develop

Browse Source
This commit is contained in:
jinling.yang
2024-03-18 15:01:54 +08:00
parent 83327136eb d4c786ff1e
commit 0324acd4fd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/views/tool_basic_param.xml
View File

@@ -124,7 +124,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="规则"> <form string="规则">
<sheet> <sheet>
<field name="cutting_tool_type" invisible="0"/> <field name="cutting_tool_type" invisible="1"/>
<field name="standard_library_id" invisible="1"/> <field name="standard_library_id" invisible="1"/>
<group> <group>
<group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"> <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">

4
sf_base/views/tool_views.xml
View File

@@ -123,10 +123,10 @@
<form string="刀具标准库" delete="0" create="0" edit="0"> <form string="刀具标准库" delete="0" create="0" edit="0">
<sheet> <sheet>
<field name="image" widget='image' class="oe_avatar" <field name="image" widget='image' class="oe_avatar"
options="{'zoom': true, 'preview_image':'image_128'}" required="1"/> required="1"/>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="code" readonly="1"/> <field name="code" readonly="1" force_save="1"/>
</h1> </h1>
</div> </div>
<group> <group>

1
sf_manufacturing/models/product_template.py
View File

@@ -331,6 +331,7 @@ class ResProductMo(models.Model):
(6, 0, self.cutting_tool_model_id.suitable_coolant_ids.ids)] (6, 0, self.cutting_tool_model_id.suitable_coolant_ids.ids)]
self.compaction_way_id = self.cutting_tool_model_id.compaction_way_id.id self.compaction_way_id = self.cutting_tool_model_id.compaction_way_id.id
self.fit_blade_shape_id = self.cutting_tool_model_id.fit_blade_shape_id.id self.fit_blade_shape_id = self.cutting_tool_model_id.fit_blade_shape_id.id
self.image_1920 = self.cutting_tool_model_id.image
else: else:
self.cutting_tool_type_id = False self.cutting_tool_type_id = False
self.brand_id = False self.brand_id = False