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

sf_base/models/process.py

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

sf_base/views/mrp_routing_workcenter_view.xml

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