Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹

sf_manufacturing/models/mrp_workcenter.py

@@ -6,7 +6,9 @@ from odoo.addons.resource.models.resource import Intervals
 
 class ResWorkcenter(models.Model):
     _inherit = "mrp.workcenter"
-    machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
+    equipment_id = fields.Many2one('maintenance.equipment', string='设备')
+    machine_tool_id = fields.Many2one('sf.machine_tool', string='机床')
+    production_line_id = fields.Many2one('sf.production.line', string='生产线')
     is_process_outsourcing = fields.Boolean('工艺外协')
     users_ids = fields.Many2many("res.users", 'users_workcenter')
 

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -105,9 +105,9 @@
             <xpath expr="//field[@name='company_id']" position="after">
                 <field name="users_ids" widget="many2many_tags" string="可操作用户"/>
             </xpath>
-
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
-                <field name="machine_tool_id" domain="[('is_binding','=',False)]"/>
+                <field name="production_line_id"/>
+                <field name="equipment_id"/>
             </xpath>
             <xpath expr="//field[@name='resource_calendar_id']" position="after">
                 <field name="is_process_outsourcing"/>