diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index d8e2ab85..12e18c1c 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -79,9 +79,9 @@ td.o_required_modifier { } .oe_kanban_card.kanban_color_1 { - background-color: #27FEA9 !important; + background-color: #fff !important; opacity: 0.7; - color: #fff; + color: #777; } .oe_kanban_card.kanban_color_3 { diff --git a/sf_machine_connect/views/machine_monitor.xml b/sf_machine_connect/views/machine_monitor.xml index 9c9a21a3..d52bead8 100644 --- a/sf_machine_connect/views/machine_monitor.xml +++ b/sf_machine_connect/views/machine_monitor.xml @@ -10,7 +10,7 @@ - + @@ -143,7 +143,7 @@ - + --> diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index acb87eb6..73826ed9 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -17,12 +17,30 @@ class SfMaintenanceEquipmentCategory(models.Model): equipment_type_code = fields.Char('简写') +class SfMaintenanceEquipmentAGVLog(models.Model): + _name = 'maintenance.equipment.agv.log' + _description = 'AGV运行日志' + + run_type = fields.Char('任务类型') + run_code = fields.Char('任务指令代码') + run_first = fields.Char('任务起点') + production_line = fields.Char('目的生产线') + run_last = fields.Char('任务终点') + workorder = fields.Char('工件编码/任务单号') + time = fields.Datetime('日期/事件') + state = fields.Char('事件/状体') + equipment_id = fields.Many2one('maintenance.equipment', '设备') + + class SfMaintenanceEquipment(models.Model): _inherit = 'maintenance.equipment' _description = '设备' crea_url = "/api/machine_tool/create" + + #AGV运行日志 + agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志') # 1212修改后的字段 number_of_axles = fields.Selection( [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴"), ("六轴", "六轴")], @@ -194,6 +212,7 @@ class SfMaintenanceEquipment(models.Model): # 多个型号对应一个机床 machine_tool_id = fields.Many2one('sf.machine_tool', '机床') sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志') + equipment_oee_ids = fields.One2many('maintenance.equipment.oee', 'equipment_id', '设备OEE') # def name_get(self): # result = [] diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py index 71802fda..6d76ffbe 100644 --- a/sf_maintenance/models/sf_maintenance_oee.py +++ b/sf_maintenance/models/sf_maintenance_oee.py @@ -23,6 +23,7 @@ class SfMaintenanceEquipmentOEE(models.Model): fault_nums = fields.Integer('故障次数') sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志', related='equipment_id.sf_maintenance_logs_ids') + oee_logs = fields.One2many('maintenance.equipment.oee.logs', 'equipment_oee_id', string='运行日志') def name_get(self): result = [] @@ -30,4 +31,19 @@ class SfMaintenanceEquipmentOEE(models.Model): if parameter.equipment_id: name = parameter.equipment_id.name result.append((parameter.id, name)) - return result \ No newline at end of file + return result + + +class SfMaintenanceEquipmentOEELog(models.Model): + _name = 'maintenance.equipment.oee.logs' + _description = '设备运行日志' + + name = fields.Char('运行日志') + run_time = fields.Datetime('时间') + state = fields.Selection([("开机", "开机"), ("关机", "关机"), ("等待", "等待"), ("开始加工", "开始加工"), + ("结束加工", "结束加工"), ("故障", "故障"), + ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态") + workorder_id = fields.Char('加工订单') + time = fields.Char('持续时长') + color = fields.Char('颜色', default=1) + equipment_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE') diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 0853ee77..076c4e76 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -7,12 +7,18 @@ access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,s access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_user,1,0,0,0 access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_manager,1,1,1,0 access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,base.group_user,1,1,1,1 +access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_group_equipment_user,1,0,0,0 +access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,base.group_user,1,1,1,1 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,0,0,0 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_manager,1,1,1,0 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,0,0,0 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_manager,1,1,1,0 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,0,0,0 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,sf_group_equipment_user,1,0,0,0 +access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,base.group_user,1,1,1,1 access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,0,0,0 diff --git a/sf_maintenance/views/maintenance_equipment_oee_views.xml b/sf_maintenance/views/maintenance_equipment_oee_views.xml index 60055631..091e3c47 100644 --- a/sf_maintenance/views/maintenance_equipment_oee_views.xml +++ b/sf_maintenance/views/maintenance_equipment_oee_views.xml @@ -49,6 +49,19 @@ + + + + + + + + + + + + + @@ -63,6 +76,7 @@ + diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 0dc18355..125a86c0 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -32,6 +32,14 @@ + @@ -63,15 +71,18 @@ attrs="{'invisible': [('equipment_type', '!=', '机床')]}"> - +