diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index f7d34f7..d5d25e6 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/v17/.suo and b/PVDEMCS/.vs/PVDEMCS/v17/.suo differ diff --git a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs index f93b0ad..fead807 100644 --- a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs +++ b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs @@ -207,6 +207,12 @@ namespace PVDEMCS.Controllers public Result GetEquipmentOEEMonthTotal(string equipmentId, DateTime begDate, DateTime endDate) { var result = _equipmentRecordService.GetEquipmentOEEMonthTotal(equipmentId, begDate, endDate); + if (result.IsSuccess && !result.Content.IsNullOrEmpty()) + { + result.Content.TotalAlarmTime = Math.Round(result.Content.TotalAlarmTime / 60, 2); + result.Content.TotalStopTime = Math.Round(result.Content.TotalStopTime / 60, 2); + result.Content.TotalRunningTime = Math.Round(result.Content.TotalRunningTime / 60, 2); + } return result; } diff --git a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs index 23b541a..500ece7 100644 --- a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs +++ b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs @@ -35,7 +35,7 @@ public partial class EquipmentRecordTotal /// /// 开炉次数 /// - public int FurnaceNum { get; set; } + public decimal FurnaceNum { get; set; } /// /// 总运行时长 diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs index 4996b16..20cc751 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs @@ -714,7 +714,7 @@ namespace PVDEMCS.Services.Repositories.Impl var result = list.GroupBy(f => f.TotalMonth).Select(f => new EquipmentOEEMonthTotal { TotalMonth = f.Key, - OEE = Math.Round(f.Sum(f => f.OEE) / f.Count(), 2) * 100 + OEE = Math.Round(f.Sum(f => f.OEE) / f.Count(), 4) * 100 }).ToList(); return new Result>(result); @@ -819,7 +819,7 @@ namespace PVDEMCS.Services.Repositories.Impl } if (minutes > 0) { - detail.OEE = Math.Round((detail.TotalRunningTime + value) / minutes, 2) * 100; + detail.OEE = Math.Round((detail.TotalRunningTime + value) / minutes, 4) * 100; }