Accept Merge Request #328: (feature/生产线优化 -> develop)
Merge Request: 生产线新增关联工作中心字段,优化看板和form视图布局 Created By: @禹翔辉 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/328?initial=true
This commit is contained in:
@@ -21,10 +21,12 @@ class ProductionLine(models.Model):
|
|||||||
num = "%03d" % m
|
num = "%03d" % m
|
||||||
return num
|
return num
|
||||||
|
|
||||||
name = fields.Char('生产线')
|
mrp_workcenter_ids = fields.One2many('mrp.workcenter', 'production_line_id', '工作中心')
|
||||||
|
name = fields.Char('生产线', size=20, required=True)
|
||||||
code = fields.Char('编码', default=_get_code, readonly=True)
|
code = fields.Char('编码', default=_get_code, readonly=True)
|
||||||
remark = fields.Char('备注')
|
remark = fields.Char('备注')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,9 @@
|
|||||||
<field name="model">sf.production.line</field>
|
<field name="model">sf.production.line</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="生产线">
|
<tree string="生产线">
|
||||||
<field name="name"/>
|
|
||||||
<field name="code"/>
|
<field name="code"/>
|
||||||
|
<field name="name"/>
|
||||||
|
<field name="mrp_workcenter_ids" widget="many2many_tags"/>
|
||||||
<field name="remark"/>
|
<field name="remark"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
@@ -18,13 +19,16 @@
|
|||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="生产线">
|
<form string="生产线">
|
||||||
<sheet>
|
<sheet>
|
||||||
|
<div class="oe_title">
|
||||||
|
<h1>
|
||||||
|
<field name="name"/>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
<group>
|
<group>
|
||||||
<group>
|
|
||||||
<field name="name"/>
|
|
||||||
<field name="remark"/>
|
|
||||||
</group>
|
|
||||||
<group>
|
<group>
|
||||||
<field name="code"/>
|
<field name="code"/>
|
||||||
|
<field name="mrp_workcenter_ids" widget="many2many_tags"/>
|
||||||
|
<field name="remark"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
@@ -54,8 +58,8 @@
|
|||||||
<!-- 在这里定义每个卡片的内容 -->
|
<!-- 在这里定义每个卡片的内容 -->
|
||||||
<div>
|
<div>
|
||||||
<strong><field name="code"/></strong>
|
<strong><field name="code"/></strong>
|
||||||
<br/>
|
<span><h1><field name="name"/></h1></span>
|
||||||
<span><field name="name"/></span>
|
<field name="mrp_workcenter_ids" widget="many2many_tags"/>
|
||||||
<br/>
|
<br/>
|
||||||
<span><field name="remark"/></span>
|
<span><field name="remark"/></span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user