diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index 945b7a86..4f926a5b 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -238,7 +238,8 @@ class Sf_Dashboard_Connect(http.Controller): for log_data in log_datas: res['data'][item].append({ 'time': log_data.time.strftime('%Y-%m-%d %H:%M:%S'), - 'state': log_data.state + 'state': log_data.state, + 'production_name': log_data.production_name, }) return json.dumps(res) # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode() diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py index 66e0a855..9a6aaba8 100644 --- a/sf_maintenance/models/sf_maintenance_oee.py +++ b/sf_maintenance/models/sf_maintenance_oee.py @@ -84,12 +84,13 @@ class SfMaintenanceEquipmentOEELog(models.Model): class SfMaintenanceEquipmentOEELogDetail(models.Model): _name = 'maintenance.equipment.oee.log.detail' _description = '设备运行日志详情' + _order = 'time desc' # sequence = fields.Integer('序号', related='id') time = fields.Datetime('时间') state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"), ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态") - production_id = fields.Many2one('mrp.production', '加工工单') + production_name = fields.Char('加工工单') log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志') # equipment_code = fields.Char('设备编码', related='log_id.equipment_code') diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index 30f1c79c..b3922595 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -207,7 +207,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -282,7 +282,7 @@ - +