update 时间问题

FrameworkLocal/Common/Utilities/DateTimeUtil.cs

@@ -8,35 +8,21 @@ namespace MECF.Framework.Common.Utilities
 {
     public class DateTimeUtil
     {
-        public static int GetSecond(string timeString)
+        public static float GetSecond(string timeString)
         {
             if (string.IsNullOrEmpty(timeString)) return 0;
 
             if (TimeSpan.TryParse(timeString, out TimeSpan timeSpan))
             {
                 // 获取总秒数（包括小数部分）
-                double totalSeconds = timeSpan.TotalSeconds;
+                float totalSeconds = (float)timeSpan.TotalSeconds;
 
                 // 将总秒数转换为整数秒数
-                int integerSeconds = Convert.ToInt32(totalSeconds);
-                return integerSeconds;
+                return totalSeconds;
 
             }
             return 0;
         }
-        public static int GetSecond(float number)
-        {
-            if (number.ToString().Contains('.'))
-            {
-                var strs = number.ToString().Split('.').Select(a => int.Parse(a)).ToList();
-                return strs[0] * 3600 + strs[1] * 60;
-            }
-            else
-            {
-                return (int)number * 3600;
-            }
-
-        }
         public static string SecondToHHmmss(string value)
         {
             if (value == null)
@@ -48,7 +34,7 @@ namespace MECF.Framework.Common.Utilities
                 TimeSpan timeSpan = TimeSpan.FromSeconds(secondAll);
 
                 // 格式化为 HH:mm:ss
-                string formattedTime = $"{timeSpan.Hours:D2}:{timeSpan.Minutes:D2}:{timeSpan.Seconds:D2}";
+                string formattedTime = $"{timeSpan.Hours:D2}:{timeSpan.Minutes:D2}:{timeSpan.Seconds:D2}.{timeSpan.Milliseconds:D1}";
                 return formattedTime;
             }
 

FrameworkLocal/UIClient/Converter/SecondsToHourMinConverter.cs

@@ -26,7 +26,7 @@ namespace MECF.Framework.UI.Client.Converter
                 TimeSpan timeSpan = TimeSpan.FromSeconds(secondAll);
 
                 // 格式化为 HH:mm:ss
-                string formattedTime = $"{timeSpan.Hours:D2}:{timeSpan.Minutes:D2}:{timeSpan.Seconds:D2}";
+                string formattedTime = $"{timeSpan.Hours:D2}:{timeSpan.Minutes:D2}:{timeSpan.Seconds:D2}.{timeSpan.Milliseconds:D1}";
                 return formattedTime;
             }
             return "";

Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -5980,9 +5980,6 @@ namespace FurnaceRT.Equipments.Jobs
 
                         if (wafer.WaferType == WaferType.SD && maintenanceItemSDCarrierUseFreq.StartValue > 0 && wafer.UseCount >= maintenanceItemSDCarrierUseFreq.LimitValue)
                         {
-                            if (maintenanceItemSDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
-
                             if (maintenanceItemSDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                             {
                                 var msg = pm.GetAlarmWarningMsg(maintenanceItemSDCarrierUseFreq);
@@ -6010,10 +6007,6 @@ namespace FurnaceRT.Equipments.Jobs
 
                         if (wafer.WaferType == WaferType.SD && maintenanceItemSDWaferUserTime.StartValue > 0 && wafer.UseTime >= maintenanceItemSDWaferUserTime.LimitValue)
                         {
-                            if (maintenanceItemSDWaferUserTime.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
-
-
                             var currentValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.CurrentValue.ToString());
                             var minValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.StartValue.ToString());
                             var maxValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.LimitValue.ToString());
@@ -6044,8 +6037,6 @@ namespace FurnaceRT.Equipments.Jobs
 
                         if (wafer.WaferType == WaferType.SD && maintenanceItemSDWaferThickness.StartValue > 0 && wafer.UseThick >= maintenanceItemSDWaferThickness.LimitValue)
                         {
-                            if (maintenanceItemSDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
 
                             if (maintenanceItemSDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                             {
@@ -6117,9 +6108,6 @@ namespace FurnaceRT.Equipments.Jobs
                         if (wafer.WaferType == WaferType.ED && maintenanceItemEDCarrierUseFreq.StartValue > 0 && wafer.UseCount >= maintenanceItemEDCarrierUseFreq.LimitValue)
                         {
 
-                            if (maintenanceItemEDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
-
                             if (maintenanceItemEDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                             {
                                 var msg = pm.GetAlarmWarningMsg(maintenanceItemEDCarrierUseFreq);
@@ -6145,8 +6133,7 @@ namespace FurnaceRT.Equipments.Jobs
 
                         if (wafer.WaferType == WaferType.ED && maintenanceItemEDWaferUserTime.StartValue > 0 && wafer.UseTime >= maintenanceItemEDWaferUserTime.LimitValue)
                         {
-                            if (maintenanceItemEDWaferUserTime.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
+                          
 
                             var currentValue = DateTimeUtil.SecondToHHmmss(maintenanceItemEDWaferUserTime.CurrentValue.ToString());
                             var minValue = DateTimeUtil.SecondToHHmmss(maintenanceItemEDWaferUserTime.StartValue.ToString());
@@ -6178,10 +6165,6 @@ namespace FurnaceRT.Equipments.Jobs
                         if (wafer.WaferType == WaferType.ED && maintenanceItemEDWaferThickness.StartValue > 0 && wafer.UseThick >= maintenanceItemEDWaferThickness.LimitValue)
                         {
 
-                            if (maintenanceItemEDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                continue;
-
-
                             if (maintenanceItemEDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                             {
                                 var msg = pm.GetAlarmWarningMsg(maintenanceItemEDWaferThickness);

Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/PreProcess.cs

@@ -130,8 +130,6 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
                                 if (wafer.WaferType == WaferType.SD && maintenanceItemSDCarrierUseFreq.StartValue > 0 && wafer.UseCount >= maintenanceItemSDCarrierUseFreq.LimitValue)
                                 {
-                                    if (maintenanceItemSDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
 
                                     if (maintenanceItemSDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                                     {
@@ -160,10 +158,6 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
                                 if (wafer.WaferType == WaferType.SD && maintenanceItemSDWaferUserTime.StartValue > 0 && wafer.UseTime >= maintenanceItemSDWaferUserTime.LimitValue)
                                 {
-                                    if (maintenanceItemSDWaferUserTime.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
-
-
                                     var currentValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.CurrentValue.ToString());
                                     var minValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.StartValue.ToString());
                                     var maxValue = DateTimeUtil.SecondToHHmmss(maintenanceItemSDWaferUserTime.LimitValue.ToString());
@@ -194,9 +188,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
                                 if (wafer.WaferType == WaferType.SD && maintenanceItemSDWaferThickness.StartValue > 0 && wafer.UseThick >= maintenanceItemSDWaferThickness.LimitValue)
                                 {
-                                    if (maintenanceItemSDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
-
+                               
                                     if (maintenanceItemSDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                                     {
                                         var msg = pm.GetAlarmWarningMsg(maintenanceItemSDWaferThickness);
@@ -270,9 +262,6 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                 if (wafer.WaferType == WaferType.ED && maintenanceItemEDCarrierUseFreq.StartValue > 0 && wafer.UseCount >= maintenanceItemEDCarrierUseFreq.LimitValue)
                                 {
 
-                                    if (maintenanceItemEDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
-
                                     if (maintenanceItemEDCarrierUseFreq.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                                     {
                                         var msg = pm.GetAlarmWarningMsg(maintenanceItemEDCarrierUseFreq);
@@ -298,8 +287,6 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
                                 if (wafer.WaferType == WaferType.ED && maintenanceItemEDWaferUserTime.StartValue > 0 && wafer.UseTime >= maintenanceItemEDWaferUserTime.LimitValue)
                                 {
-                                    if (maintenanceItemEDWaferUserTime.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
 
                                     var currentValue = DateTimeUtil.SecondToHHmmss(maintenanceItemEDWaferUserTime.CurrentValue.ToString());
                                     var minValue = DateTimeUtil.SecondToHHmmss(maintenanceItemEDWaferUserTime.StartValue.ToString());
@@ -331,10 +318,6 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                 if (wafer.WaferType == WaferType.ED && maintenanceItemEDWaferThickness.StartValue > 0 && wafer.UseThick >= maintenanceItemEDWaferThickness.LimitValue)
                                 {
 
-                                    if (maintenanceItemEDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.None.ToString())
-                                        continue;
-
-
                                     if (maintenanceItemEDWaferThickness.MaintenanceProcessing == MaintenanceProcessingCommandEnum.AlarmReport.ToString())
                                     {
                                         var msg = pm.GetAlarmWarningMsg(maintenanceItemEDWaferThickness);

Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/Process.cs

@@ -755,12 +755,12 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                         var useTime = wafers[i].UseTime + (float)stepTime;
                                         var useThick = wafers[i].UseThick + thickness;
 
-                                        WaferManager.Instance.UpdateWaferStatistics(ModuleHelper.Converter(Module), i, useCount, (float)Math.Round(useTime, 2), useThick);
+                                        WaferManager.Instance.UpdateWaferStatistics(ModuleHelper.Converter(Module), i, useCount, (float)Math.Round(useTime, 1), useThick);
                                     }
                                     PMModule.UpdateRecipeThickness(PMModule.RecipeRunningInfo.RecipeName, thickness);
                                     PMModule.UpdateRecipeStepFre(stepName);
 
-                                    PMModule.UpdateRecipeStepRunTime(stepName, Math.Round(stepTime, 2));
+                                    PMModule.UpdateRecipeStepRunTime(stepName, Math.Round(stepTime, 1));
                                     PMModule.UpdateRecipeStepGroupThickness(stepName, thickness);
 
                                 }
@@ -787,7 +787,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                                     var useTime = wafers[i].UseTime;
                                     var useThick = wafers[i].UseThick;
 
-                                    WaferManager.Instance.UpdateWaferStatistics(ModuleHelper.Converter(Module), i, useCount, (float)Math.Round(useTime, 2), useThick);
+                                    WaferManager.Instance.UpdateWaferStatistics(ModuleHelper.Converter(Module), i, useCount, (float)Math.Round(useTime, 1), useThick);
 
                                 }
                                 PMModule.UpdateSEDWafer(WaferManager.Instance.GetAllWafers());