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

Accept Merge Request #2293: (feature/7254_new -> develop)

Browse Source 
Merge Request: 材料型号增加是否磁吸

Created By: @刘磊
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @刘磊
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2293
This commit is contained in:
刘磊
2025-07-18 15:12:05 +08:00
committed by Coding
parent b2a0899553 2347ed9cb3
commit 62f0578ce8
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_base/models/common.py
View File

@@ -42,6 +42,7 @@ class MrsMaterialModel(models.Model):
materials_num = fields.Char("编码号")
name = fields.Char('型号名')
need_h = fields.Boolean("热处理", default="false")
need_m = fields.Boolean("是否磁吸", default="false")
mf_materia_post = fields.Char("热处理后密度")
density = fields.Float("密度(kg/m³)")
materials_id = fields.Many2one('sf.production.materials', "材料名")

3
sf_base/views/common_view.xml
View File

@@ -263,6 +263,7 @@
<field name="materials_no" readonly="1" force_save="1"/>
<field name="gain_way" required="0"/>
<field name="density" readonly="1" required="1" class="custom_required"/>
<field name="need_m" default="false" readonly="1"/>
</group>
<group>
<field name="rough_machining" required="1"/>
@@ -306,6 +307,7 @@
<field name="tensile_strength"/>
<field name="hardness" optional="show"/>
<field name="need_h"/>
<field name="need_m"/>
<field name="apply" widget="many2many_tags" optional="show"/>
<field name="density" optional="show"/>
<field name="rough_machining" optional="hide"/>
@@ -352,6 +354,7 @@
<field name="materials_no"/>
<field name="name"/>
<field name="need_h"/>
<field name="need_m"/>
<field name="mf_materia_post"/>
<field name="density"/>
<field name='materials_id' default="default" invisible="1"/>