|
@@ -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)
|
|
|
{
|