diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 5eeddc42..4274fe80 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -303,6 +303,9 @@
+
+
+
diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py index 525c2f54..3bc3aa17 100644 --- a/sf_manufacturing/models/mrp_workcenter.py +++ b/sf_manufacturing/models/mrp_workcenter.py @@ -9,7 +9,6 @@ class ResWorkcenter(models.Model): # 生产线显示 production_line_show = fields.Char(string='生产线') - 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('工艺外协') @@ -19,6 +18,12 @@ class ResWorkcenter(models.Model): 'maintenance.equipment', string="设备", check_company=True) + equipment_status = fields.Selection( + [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")], + string="设备状态", related='equipment_id.state') + + equipment_image = fields.Binary('设备图片', related='equipment_id.machine_tool_picture') + # 查询工艺外协加工中心 def get_process_outsourcing_workcenter(self): outsourcing_workcenter = self.env['mrp.workcenter'].search([('is_process_outsourcing', '=', True)]) diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index 3bd8260e..cda445ec 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -24,19 +24,28 @@ - - - - - - - - - - - - - + + mrp.workcenter.view.kanban.inherit.mrp.workorder + mrp.workcenter + + + + + + + + + + + + + + + + + + + @@ -90,6 +99,7 @@ +