jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
liaodanlong
2024-11-05 10:59:36 +08:00
parent ba9ce1f0ee 41cd76ad14
commit 77c303e1fe
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sf_maintenance/models/sf_maintenance_oee.py
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='日志详情')

2
sf_manufacturing/models/mrp_production.py
View File

@@ -806,6 +806,8 @@ class MrpProduction(models.Model):
'date_to': date_planned_end, 'date_to': date_planned_end,
}) })
# work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end}) # work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end})
# 设置一个较大的结束时间，防止在设置开始时间时，结束时间小于开始时间
work.date_planned_finished = datetime.datetime.today() + datetime.timedelta(days=100)
work.date_planned_start = date_planned_start work.date_planned_start = date_planned_start
work.date_planned_finished = date_planned_end work.date_planned_finished = date_planned_end
routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search( routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(