Browse Source

从Tin迁移解决处理recipe手动abort导致建表少Scheduler.CoolingRemainTime列的bug

huangping 1 month ago
parent
commit
df1874e15f

+ 1 - 1
FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/ProcessDetailViewModel.cs

@@ -1401,7 +1401,7 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
                     else
                     {
                         StepNameDisPlay = $"{step.StepNo}:{step.StepName}";
-                        LOG.Info($"CurrentTime:{PointTime:yyyy/MM/dd HH:mm:ss.FFF} {StepNameDisPlay}");
+                       // LOG.Info($"CurrentTime:{PointTime:yyyy/MM/dd HH:mm:ss.FFF} {StepNameDisPlay}");
                     }
                     var name = (seriesinfo.RenderableSeries as ChartDataLine<T>).DataSource.Split('.','\\');
                     if (name.Length>0)

+ 2 - 1
Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -151,7 +151,7 @@ namespace FurnaceRT.Equipments.Jobs
 
                 var coolTime = pj != null ? pj.CoolTimeSec : 0;
                 if (_coolTimer.IsRunning)
-                    return (coolTime - _coolTimer.ElapsedMilliseconds / 1000) > 0 ? coolTime - _coolTimer.ElapsedMilliseconds / 1000 : 0;
+                    return (coolTime - _coolTimer.ElapsedMilliseconds / 1000) > 0 ? (int)(coolTime - _coolTimer.ElapsedMilliseconds / 1000) : 0;
                 return coolTime;
             });
             DATA.Subscribe($"Scheduler.StockerUseSlots", () =>
@@ -798,6 +798,7 @@ namespace FurnaceRT.Equipments.Jobs
                     JobDataRecorder.EndPJ(pj.InnerId.ToString(), aborted, unprocessed);
                 }
             }
+            if (_coolTimer.IsRunning) _coolTimer.Stop();
             Singleton<FAJobController>.Instance.FAProcessJobs[jobName].RequestAbort();
             foreach (var pj in pjAbortList)
             {