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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程

Browse Source
This commit is contained in:
gqh
2022-11-07 16:43:45 +08:00
parent 7118596e1c cbf1cd8b0b
commit 1cafd2c309
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_base/models/process.py
View File

@@ -12,6 +12,13 @@ class ModelType(models.Model):
class ResMrpRoutingWorkcenter(models.Model): class ResMrpRoutingWorkcenter(models.Model):
_inherit = 'mrp.routing.workcenter' _inherit = 'mrp.routing.workcenter'
routing_type = fields.Selection([
('装夹', '装夹'),
('前置三元定位检测', '前置三元定位检测'),
('CNC加工', 'CNC加工'),
('置三元质量检测', '置三元质量检测'),
('解除装夹', '解除装夹'),
], string="工序类型")
is_repeat = fields.Boolean('重复', default=False) is_repeat = fields.Boolean('重复', default=False)
workcenter_id = fields.Many2one('mrp.workcenter', required=False) workcenter_id = fields.Many2one('mrp.workcenter', required=False)
workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True) workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)

1
sf_base/views/mrp_routing_workcenter_view.xml
View File

@@ -11,6 +11,7 @@
<field name="workcenter_ids" widget="many2many_tags" string="工作中心" required="0"/> <field name="workcenter_ids" widget="many2many_tags" string="工作中心" required="0"/>
</field> </field>
<field name="bom_product_template_attribute_value_ids" position="after"> <field name="bom_product_template_attribute_value_ids" position="after">
<field name="routing_type" required="1"/>
<field name="is_repeat"/> <field name="is_repeat"/>
</field> </field>
</field> </field>