From e28942111bfc5edceb35bf79f235c632f4f5ad74 Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Sun, 26 Nov 2023 21:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=82=89=E6=95=B0=E6=8D=AE=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PVDEMCS/.vs/PVDEMCS/v17/.suo | Bin 215552 -> 190976 bytes .../Controllers/EquipmentRecordController.cs | 6 ++++++ .../Services/Models/EquipmentRecordTotal.cs | 2 +- .../Impl/EquipmentRecordRepository.cs | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index f7d34f702612c168175bf28c086d25d3d2f5da59..d5d25e6adb15ac6cb5d80126987de970b1a57bc1 100644 GIT binary patch delta 7971 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 A^Z)<= delta 7735 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 KzAicV)_((p*q)XE 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; }