From 48ab8919910a6863291640c132c2d23e0d22a1d7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 27 Sep 2024 10:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87oee?=
=?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_machine_connect/__manifest__.py | 1 -
sf_machine_connect/models/ftp_client.py | 20 --
.../views/maintenance_views.xml | 17 --
sf_maintenance/models/sf_maintenance_oee.py | 27 +-
sf_maintenance/security/ir.model.access.csv | 3 -
.../views/maintenance_equipment_oee_views.xml | 55 +++-
.../views/maintenance_logs_views.xml | 243 ------------------
7 files changed, 60 insertions(+), 306 deletions(-)
delete mode 100644 sf_machine_connect/views/maintenance_views.xml
diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py
index ac8aef64..db7ae467 100644
--- a/sf_machine_connect/__manifest__.py
+++ b/sf_machine_connect/__manifest__.py
@@ -30,7 +30,6 @@
'views/machine_info_present.xml',
'views/delivery_record.xml',
'views/res_config_settings_views.xml',
- 'views/maintenance_views.xml',
],
'assets': {
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 1d56424f..b5c99a7a 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -285,26 +285,6 @@ class Machine_ftp(models.Model):
# # 开动率
run_rate = fields.Char('开动率', readonly=True)
- # 同步CNC设备到oee
- def sync_oee(self):
- """
- 同步CNC设备到oee
- :return:
- """
- for record in self:
- record.ensure_one()
- cnc_oee_dict = {
- 'equipment_id': record.id,
- 'type_id': record.type_id.id,
- 'machine_tool_picture': record.machine_tool_picture,
- 'equipment_code': record.code,
- 'function_type': record.function_type,
- }
- if self.env['maintenance.equipment.oee.logs'].search([('equipment_id', '=', record.id)]):
- self.env['maintenance.equipment.oee.logs'].write(cnc_oee_dict)
- else:
- self.env['maintenance.equipment.oee.logs'].create(cnc_oee_dict)
-
class WorkCenterBarcode(models.Model):
"""
diff --git a/sf_machine_connect/views/maintenance_views.xml b/sf_machine_connect/views/maintenance_views.xml
deleted file mode 100644
index 82c5aff4..00000000
--- a/sf_machine_connect/views/maintenance_views.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- sf.machine.hr.equipment.view.tree.inherit
- maintenance.equipment
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py
index ee2c209c..26264c8e 100644
--- a/sf_maintenance/models/sf_maintenance_oee.py
+++ b/sf_maintenance/models/sf_maintenance_oee.py
@@ -22,18 +22,27 @@ class SfMaintenanceEquipmentOEE(models.Model):
[("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
("封存(报废)", "封存(报废)")],
default='正常', string="机床状态", related='equipment_id.state')
- run_time = fields.Float('加工时长(h)')
- equipment_time = fields.Float('开机时长(h)')
- done_nums = fields.Integer('加工件数')
- utilization_rate = fields.Char('可用率')
- fault_time = fields.Float('故障时长')
- fault_nums = fields.Integer('故障次数')
- # 故障率
- fault_rate = fields.Char('故障率')
+
+ online_time = fields.Char('开机时长', reaonly='True')
+
+ offline_time = fields.Char('关机时长', reaonly='True')
+ offline_nums = fields.Integer('关机次数', reaonly='True')
+ # 待机时长
+
+ idle_time = fields.Char('待机时长', reaonly='True')
+
+ # 待机率
+ idle_rate = fields.Char('待机率', reaonly='True')
+
+ work_time = fields.Char('加工时长', reaonly='True')
+ work_rate = fields.Char('可用率', reaonly='True')
+ fault_time = fields.Char('故障时长', reaonly='True')
+ fault_rate = fields.Char('故障率', reaonly='True')
+ fault_nums = fields.Integer('故障次数', reaonly='True')
+
# 设备故障日志
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='运行日志')
day_logs_detail = fields.Html('日运行日志详情')
history_logs_detail = fields.Html('历史运行日志详情')
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index ae18b36f..abbd4878 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -67,6 +67,3 @@ access_sf_cutting_tool_type_admin_sf_group_equipment_user,sf_cutting_tool_type_a
access_sf_cutting_tool_type_group_purchase_director_sf_group_equipment_user,sf_cutting_tool_type_group_purchase_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
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,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_equipment_oee_views.xml b/sf_maintenance/views/maintenance_equipment_oee_views.xml
index 22423be7..dbb00e0f 100644
--- a/sf_maintenance/views/maintenance_equipment_oee_views.xml
+++ b/sf_maintenance/views/maintenance_equipment_oee_views.xml
@@ -8,13 +8,13 @@
-
-
-
-
+
+
+
+
@@ -37,19 +37,48 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index 1b7b28f3..1dd4b9ea 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -105,249 +105,6 @@
-
-
- maintenance.logs.run.tree
- maintenance.equipment.oee.logs
-
-
-
-
-
-
-
-
- maintenance.logs.run.form
- maintenance.equipment.oee.logs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- maintenance.logs.run.detail.tree
- maintenance.equipment.oee.log.detail
-
-
-
-
-
-
-
-
-
-
-
- maintenance.logs.run.detail.form
- maintenance.equipment.oee.log.detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备运行日志
- ir.actions.act_window
- maintenance.equipment.oee.logs
-
- tree,form
-
-
-
-
- 设备运行日志
-
-
-
-
-
-
-
-