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

同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工

Browse Source
This commit is contained in:
jinling.yang
2023-08-21 11:49:24 +08:00
parent 78ddf4e52f
commit f6841e5e9f
3 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/models/common.py
View File

@@ -67,6 +67,10 @@ class MrsMaterialModel(models.Model):
mf_materia_post = fields.Char("热处理后密度")
density = fields.Float("密度(kg/m³)")
materials_id = fields.Many2one('sf.production.materials', "材料名")
tensile_strength = fields.Float("拉伸强度(n/mm²)")
hardness = fields.Float("硬度(hrc)")
rough_machining = fields.Float("粗加工Vc(m/min)")
finish_machining = fields.Float("精加工Vc(m/min)")
remark = fields.Text("备注")
gain_way = fields.Selection(
[("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")],

64
sf_base/views/common_view.xml
View File

@@ -82,7 +82,7 @@
<field name="arch" type="xml">
<tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="1">
<field name="sequence" widget="handle" string="序号"/>
<field name="code" />
<field name="code"/>
<field name="name" string="名称"/>
</tree>
</field>
@@ -105,8 +105,8 @@
<field name="model">sf.production.process</field>
<field name="arch" type="xml">
<tree string="表面工艺" create="0" edit="0" delete="1">
<field name="process_encode" />
<field name="name" string="名称"/>
<field name="process_encode"/>
<field name="name" string="名称"/>
<field name="remark"/>
</tree>
</field>
@@ -204,12 +204,15 @@
</div>
<group>
<group>
<field name="name" readonly="1"/>
<field name="name" readonly="1"/>
<field name="gain_way" required="1"/>
<field name="tensile_strength" required="1"/>
<field name="hardness" required="1"/>
<field name="density" readonly="1"/>
</group>
<group>
<field name="rough_machining" required="1"/>
<field name="finish_machining" required="1"/>
<field name="need_h" default="false" readonly="1"/>
<field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "
readonly="1"/>
@@ -242,8 +245,13 @@
<field name="materials_no" readonly="1"/>
<field name="name" readonly="1"/>
<field name="gain_way"/>
<field name="need_h" readonly="1"/>
<field name="density" readonly="1"/>
<field name="tensile_strength"/>
<field name="hardness"/>
<field name="need_h"/>
<field name="density"/>
<field name="rough_machining"/>
<field name="finish_machining"/>
<field name="remark"/>
<field name='materials_id' invisible="1"/>
</tree>
</field>
@@ -353,26 +361,26 @@
</record>
<!-- <record model="ir.ui.view" id="sf_tray_form">-->
<!-- <field name="name">sf.tray.form</field>-->
<!-- <field name="model">sf.tray</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="托盘">-->
<!-- <header>-->
<!-- <field name='state' widget="radio" options="{'horizontal': True}"/>-->
<!-- </header>-->
<!-- <sheet>-->
<!-- <group name="group1">-->
<!-- <group>-->
<!-- <field name="code" required="1"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="name" required="1"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- </sheet>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record model="ir.ui.view" id="sf_tray_form">-->
<!-- <field name="name">sf.tray.form</field>-->
<!-- <field name="model">sf.tray</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="托盘">-->
<!-- <header>-->
<!-- <field name='state' widget="radio" options="{'horizontal': True}"/>-->
<!-- </header>-->
<!-- <sheet>-->
<!-- <group name="group1">-->
<!-- <group>-->
<!-- <field name="code" required="1"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="name" required="1"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- </sheet>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
</data>
</odoo>