From c666351993fc6c86d0fd8e4e3664b8e889b7cf44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com>
Date: Wed, 19 Mar 2025 14:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C=E7=BB=A9?=
 =?UTF-8?q?=E6=95=88=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/dev/DevicePerformanceController.cs    |  4 ---
 .../MES/dev/DevicePerformanceService.cs       | 25 ++++++++++++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
index 73174e7..51cd334 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
@@ -74,10 +74,6 @@ namespace DOAN.Admin.WebApi.Controllers
 				data = "填写日期不能重复";
 
 			}
-			else if (response == -2)
-			{
-				data = "填写日期不能为空";
-			}
 			else
 			{
 				data = "成功";
diff --git a/DOAN.Service/MES/dev/DevicePerformanceService.cs b/DOAN.Service/MES/dev/DevicePerformanceService.cs
index 2e2f6f7..c966acd 100644
--- a/DOAN.Service/MES/dev/DevicePerformanceService.cs
+++ b/DOAN.Service/MES/dev/DevicePerformanceService.cs
@@ -174,11 +174,28 @@ namespace DOAN.Service.MES.dev
                 model.ComprehensiveEquipmentOperatingRate = 0;
 
 			}
-            //MTBF(设备实际运行时间/故障总次数/60
-            model.Mtbf = Math.Round((model.DeviceActualRuntime / model.FaultShutdownQuantity??0) / 60,2);
 
-            //MTTR（设备故障停机时间/故障总次数）
-            model.Mttr = Math.Round(model.AccidentDeviceFailureTime / model.FaultShutdownQuantity ?? 0, 2);
+            if (model.FaultShutdownQuantity != null && model.FaultShutdownQuantity.Value != 0)
+            {
+                //MTBF(设备实际运行时间/故障总次数/60
+                model.Mtbf = Math.Round((model.DeviceActualRuntime / model.FaultShutdownQuantity.Value) / 60, 2);
+            }
+            else
+            {
+                model.Mtbf = 0;
+
+			}
+
+            if (model.FaultShutdownQuantity != null && model.FaultShutdownQuantity.Value != 0)
+            {
+				//MTTR（设备故障停机时间/故障总次数）
+				model.Mttr = Math.Round(model.AccidentDeviceFailureTime / model.FaultShutdownQuantity.Value, 2);
+			}
+            else
+            {
+				model.Mtbf = 0;
+			}
+          
 
 
         }