diff --git a/sf_machine_connect/__init__.py b/sf_machine_connect/__init__.py
index 9b429614..6bac603e 100644
--- a/sf_machine_connect/__init__.py
+++ b/sf_machine_connect/__init__.py
@@ -1,2 +1,3 @@
from . import models
from . import wizard
+from . import controllers
diff --git a/sf_machine_connect/controllers/__init__.py b/sf_machine_connect/controllers/__init__.py
new file mode 100644
index 00000000..e046e49f
--- /dev/null
+++ b/sf_machine_connect/controllers/__init__.py
@@ -0,0 +1 @@
+from . import controllers
diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
new file mode 100644
index 00000000..ba8139d0
--- /dev/null
+++ b/sf_machine_connect/controllers/controllers.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+import ast
+import json
+import logging
+from odoo import http
+from odoo.http import request
+
+
+class Sf_Dashboard_Connect(http.Controller):
+
+ @http.route('/api/get_machine_datas/list', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
+ cors="*")
+ def get_machine_datas_list(self, **kw):
+ """
+ 拿到机床数据返回给大屏展示
+ :param kw:
+ :return:
+ """
+ res = {'status': 1, 'message': '成功', 'data': []}
+ logging.info('前端请求机床数据的参数为:%s' % kw)
+ # tem_list = [
+ # "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
+ # "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-4", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-5",
+ # "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-6", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-7",
+ # "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-8", "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-2",
+ # "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-9", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-10",
+ # "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-11", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-12",
+ # "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-13", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-14"
+ # ]
+ try:
+ equipment_obj = request.env['maintenance.equipment'].sudo()
+ # 获取请求的机床数据
+ machine_list = ast.literal_eval(kw['machine_list'])
+ for item in machine_list:
+ machine_data = equipment_obj.search([('code', '=', item)])
+ if machine_data:
+ res['data'].append({
+ 'id': machine_data.id,
+ 'name': machine_data.name,
+ 'code': machine_data.code,
+ 'status': machine_data.status,
+ 'run_status': machine_data.run_status,
+ 'run_time': machine_data.run_time,
+ 'system_date': machine_data.system_date,
+ 'system_time': machine_data.system_time,
+ 'cut_time': machine_data.cut_time,
+ 'cut_status': machine_data.cut_status,
+ 'program': machine_data.program,
+ 'program_name': machine_data.program_name,
+ 'program_status': machine_data.program_status,
+ 'tool_num': machine_data.tool_num,
+ 'machine_power_on_time': machine_data.machine_power_on_time,
+ 'product_counts': machine_data.product_counts,
+ 'mode': machine_data.mode,
+ 'start_time': machine_data.start_time,
+ 'end_time': machine_data.end_time,
+ 'program_start_time': machine_data.program_start_time,
+ 'program_end_time': machine_data.program_end_time,
+ 'standby_start_time': machine_data.standby_start_time,
+ 'standby_end_time': machine_data.standby_end_time,
+ 'offline_start_time': machine_data.offline_start_time,
+ 'offline_end_time': machine_data.offline_end_time,
+ 'emg_status': machine_data.emg_status,
+ 'current_program': machine_data.current_program,
+ 'current_program_seq': machine_data.current_program_seq,
+ 'x_abs_pos': machine_data.x_abs_pos,
+ 'y_abs_pos': machine_data.y_abs_pos,
+ 'z_abs_pos': machine_data.z_abs_pos,
+ 'feed_speed_set': machine_data.feed_speed_set,
+ 'act_feed_speed': machine_data.act_feed_speed,
+ 'spindle_speed_set': machine_data.spindle_speed_set,
+ 'act_spindle_speed': machine_data.act_spindle_speed,
+ 'spindle_load': machine_data.spindle_load,
+ 'x_axis_load': machine_data.x_axis_load,
+ 'y_axis_load': machine_data.y_axis_load,
+ 'z_axis_load': machine_data.z_axis_load,
+ 'rapid_feed': machine_data.rapid_feed,
+ 'feed_rate': machine_data.feed_rate,
+ 'x_mach_coord': machine_data.x_mach_coord,
+ 'y_mach_coord': machine_data.y_mach_coord,
+ 'z_mach_coord': machine_data.z_mach_coord,
+ 'x_rel_coord': machine_data.x_rel_coord,
+ 'y_rel_coord': machine_data.y_rel_coord,
+ 'z_rel_coord': machine_data.z_rel_coord,
+ 'x_dis_coord': machine_data.x_dis_coord,
+ 'y_dis_coord': machine_data.y_dis_coord,
+ 'z_dis_coord': machine_data.z_dis_coord,
+ 'alarm_time': machine_data.alarm_time,
+ 'alarm_msg': machine_data.alarm_msg,
+ 'clear_time': machine_data.clear_time,
+ })
+
+ return json.JSONEncoder().encode(res)
+ except Exception as e:
+ logging.info('前端请求机床数据失败，原因:%s' % e)
+ res['status'] = -1
+ res['message'] = '前端请求机床数据失败，原因:%s' % e
+ return json.JSONEncoder().encode(res)
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 2d9ad9a5..1e09f665 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -208,24 +208,22 @@ class Machine_ftp(models.Model):
# 机床采集项目
timestamp = fields.Datetime('时间戳', readonly=True)
status = fields.Boolean('机床在线状态', readonly=True)
- run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='机床运行状态',
- readonly=True, default='0')
+ # run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='机床运行状态',
+ # readonly=True, default='0')
+ run_status = fields.Char('机床运行状态', readonly=True)
run_time = fields.Char('机床累计运行时长', readonly=True)
# 机床系统日期
system_date = fields.Char('机床系统日期', readonly=True)
# 机床系统时间
system_time = fields.Char('机床系统时间', readonly=True)
-
cut_time = fields.Char('机床累计切削时间', readonly=True)
- cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], string='机床当前切削状态',
- readonly=True, default='0')
+ # cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], string='机床当前切削状态',
+ # readonly=True, default='0')
+ cut_status = fields.Char('机床当前切削状态', readonly=True)
# 当前程序名
-
program = fields.Char('机床当前程序', readonly=True)
-
# 当前刀具号
tool_num = fields.Integer('机床当前刀具号', readonly=True)
-
# 机床通电开机时间, 机床加工件数, 机床当前操作模式, 开始加工时间, 结束加工时间, 加工程序开始时间, 加工程序结束时间, 待机开始时间,
# 待机结束时间, 机床离线开始时间, 机床离线结束时间, 机床急停状态, 机床主程序名称, 程序运行的状态, 机床当前执行指令, 机床当前执行语句号
# 机床X轴当前位置, 机床Y轴当前位置, 机床Z轴当前位置
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