diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py index 6e8db042..41301410 100644 --- a/sf_maintenance/models/sf_maintenance_oee.py +++ b/sf_maintenance/models/sf_maintenance_oee.py @@ -42,7 +42,8 @@ class SfMaintenanceEquipmentOEELog(models.Model): _description = '设备运行日志' equipment_id = fields.Many2one('maintenance.equipment', '机台号') - name = fields.Char('设备名称') + equipment_code = fields.Char('设备编码') + name = fields.Char('设备名称', readonly='True') machine_tool_picture = fields.Binary('设备图片') type_id = fields.Many2one('sf.machine_tool.type', '品牌型号') state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"), @@ -70,6 +71,11 @@ class SfMaintenanceEquipmentOEELog(models.Model): # work_nums = fields.Integer('加工件数') equipment_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE') + @api.onchange('equipment_id') + def get_name(self): + self.name = self.equipment_id.name + self.equipment_code = self.equipment_id.code + # 设备运行日志详情 class SfMaintenanceEquipmentOEELogDetail(models.Model): diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index fec317c2..ae18b36f 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -68,5 +68,5 @@ access_sf_cutting_tool_type_group_purchase_director_sf_group_equipment_user,sf_c access_sf_cutting_tool_type_group_sale_director_sf_group_equipment_user,sf_cutting_tool_type_group_sale_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0 access_sf_cutting_tool_type_group_plan_director_sf_group_equipment_user,sf_cutting_tool_type_group_plan_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0 -access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,0 -access_maintenance_equipment_oee_log_detail,maintenance_equipment_oee_log_detail,model_maintenance_equipment_oee_log_detail,sf_maintenance.sf_group_equipment_manager,1,1,1,0 \ No newline at end of file +access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,1 +access_maintenance_equipment_oee_log_detail,maintenance_equipment_oee_log_detail,model_maintenance_equipment_oee_log_detail,sf_maintenance.sf_group_equipment_manager,1,1,1,1 \ No newline at end of file diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index 8c80372d..0d172285 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -156,6 +156,7 @@ + @@ -195,8 +196,27 @@ - - + + + + + + + + + + + + + + + + + + + + + @@ -256,22 +276,15 @@ maintenance.equipment.oee.log.detail
-
- -
-
-

- -

-
- - + + - + +