|
@@ -803,7 +803,11 @@ namespace FurnaceRT.Equipments.Jobs
|
|
|
}
|
|
|
}
|
|
|
if (_coolTimer.IsRunning) _coolTimer.Stop();
|
|
|
- Singleton<FAJobController>.Instance.FAProcessJobs[jobName].RequestAbort();
|
|
|
+
|
|
|
+ if (!string.IsNullOrEmpty(jobName) && Singleton<FAJobController>.Instance.FAProcessJobs.ContainsKey(jobName))
|
|
|
+ {
|
|
|
+ Singleton<FAJobController>.Instance.FAProcessJobs[jobName].RequestAbort();
|
|
|
+ }
|
|
|
foreach (var pj in pjAbortList)
|
|
|
{
|
|
|
_lstProcessJobs.Remove(pj);
|
|
@@ -6610,8 +6614,10 @@ namespace FurnaceRT.Equipments.Jobs
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (m1Count < pj.Monitor1Slots.Count || m2Count < pj.Monitor2Slots.Count || pCount < pj.ProductSlots.Count)
|
|
|
+ var a = pj.Monitor1Slots != null && m1Count < pj.Monitor1Slots.Count;
|
|
|
+ var b = pj.Monitor2Slots != null && m2Count < pj.Monitor2Slots.Count;
|
|
|
+ var c = pj.ProductSlots != null && pCount < pj.ProductSlots.Count;
|
|
|
+ if (a || b || c)
|
|
|
return false;
|
|
|
|
|
|
return isReady;
|