Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

This commit is contained in:
mgw
2024-11-06 09:23:42 +08:00

View File

@@ -62,22 +62,22 @@ class SfMaintenanceEquipmentOEE(models.Model):
("封存(报废)", "封存(报废)")], ("封存(报废)", "封存(报废)")],
default='正常', string="机床状态", related='equipment_id.state') default='正常', string="机床状态", related='equipment_id.state')
online_time = fields.Char('开机时长(小时)', reaonly='True') online_time = fields.Char('开机时长(小时)', readonly='True')
offline_time = fields.Char('关机时长(小时)', reaonly='True') offline_time = fields.Char('关机时长(小时)', readonly='True')
idle_nums = fields.Integer('待机次数', reaonly='True') idle_nums = fields.Integer('待机次数', readonly='True')
# 待机时长 # 待机时长
idle_time = fields.Char('待机时长(小时)', reaonly='True') idle_time = fields.Char('待机时长(小时)', readonly='True')
# 待机率 # 待机率
idle_rate = fields.Char('待机率(%)', reaonly='True') idle_rate = fields.Char('待机率(%)', readonly='True')
work_time = fields.Char('加工时长(小时)', reaonly='True') work_time = fields.Char('加工时长(小时)', readonly='True')
work_rate = fields.Char('可用率(%)', reaonly='True') work_rate = fields.Char('可用率(%)', readonly='True')
fault_time = fields.Char('故障时长(小时)', reaonly='True') fault_time = fields.Char('故障时长(小时)', readonly='True')
fault_rate = fields.Char('故障率(%)', reaonly='True') fault_rate = fields.Char('故障率(%)', readonly='True')
fault_nums = fields.Integer('故障次数', reaonly='True') fault_nums = fields.Integer('故障次数', readonly='True')
# 设备故障日志 # 设备故障日志
sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志', sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志',
@@ -367,25 +367,25 @@ class SfMaintenanceEquipmentOEELog(models.Model):
[("ZXJGZX", "钻铣加工中心"), ("CXJGZX", "车削加工中心"), ("FHJGZX", "复合加工中心")], [("ZXJGZX", "钻铣加工中心"), ("CXJGZX", "车削加工中心"), ("FHJGZX", "复合加工中心")],
default="", string="功能类型") default="", string="功能类型")
machine_tool_picture = fields.Binary('设备图片') machine_tool_picture = fields.Binary('设备图片')
type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', reaonly='True') type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', readonly='True')
state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"), state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
("检修", "检修"), ("保养", "保养")], default="", string="实时状态") ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
online_time = fields.Char('开机时长', reaonly='True') online_time = fields.Char('开机时长', readonly='True')
offline_time = fields.Char('关机时长', reaonly='True') offline_time = fields.Char('关机时长', readonly='True')
offline_nums = fields.Integer('关机次数', reaonly='True') offline_nums = fields.Integer('关机次数', readonly='True')
# 待机时长 # 待机时长
idle_time = fields.Char('待机时长', reaonly='True') idle_time = fields.Char('待机时长', readonly='True')
# 待机率 # 待机率
idle_rate = fields.Char('待机率', reaonly='True') idle_rate = fields.Char('待机率', readonly='True')
work_time = fields.Char('加工时长', reaonly='True') work_time = fields.Char('加工时长', readonly='True')
work_rate = fields.Char('可用率', reaonly='True') work_rate = fields.Char('可用率', readonly='True')
fault_time = fields.Char('故障时长', reaonly='True') fault_time = fields.Char('故障时长', readonly='True')
fault_rate = fields.Char('故障率', reaonly='True') fault_rate = fields.Char('故障率', readonly='True')
fault_nums = fields.Integer('故障次数', reaonly='True') fault_nums = fields.Integer('故障次数', readonly='True')
detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情') detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情')