diff --git a/SicRT/Config/Gem.exml b/SicRT/Config/Gem.exml
index e0ae51a..3107916 100644
--- a/SicRT/Config/Gem.exml
+++ b/SicRT/Config/Gem.exml
@@ -662,44 +662,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/SicRT/Equipments/AutoTransfer.cs b/SicRT/Equipments/AutoTransfer.cs
index f874b5f..852212f 100644
--- a/SicRT/Equipments/AutoTransfer.cs
+++ b/SicRT/Equipments/AutoTransfer.cs
@@ -801,28 +801,44 @@ namespace SicRT.Modules
public void Abort()
{
- var wafer = WaferManager.Instance.GetWafer(ModuleName.PM1, 0);
- if (wafer != null)
+ try
{
- AutoJobRecorder.UpdatePosition(wafer.WaferID.ToString(), ModuleName.PM1.ToString(), "Abort");
- }
+ var wafer = WaferManager.Instance.GetWafer(ModuleName.PM1, 0);
+ if (wafer != null && wafer.WaferID != null)
+ {
+ AutoJobRecorder.UpdatePosition(wafer.WaferID.ToString(), ModuleName.PM1.ToString(), "Abort");
+ }
- var wafer1 = WaferManager.Instance.GetWafer(ModuleName.TMRobot, 0);
- if (wafer1 != null)
- {
- AutoJobRecorder.UpdatePosition(wafer1.WaferID.ToString(), ModuleName.TM.ToString(), "Abort");
- }
+ var wafer1 = WaferManager.Instance.GetWafer(ModuleName.TMRobot, 0);
+ if (wafer1 != null && wafer1.WaferID != null)
+ {
+ AutoJobRecorder.UpdatePosition(wafer1.WaferID.ToString(), ModuleName.TM.ToString(), "Abort");
+ }
- var wafer2 = WaferManager.Instance.GetWafer(ModuleName.Buffer, 0);
- if (wafer2 != null)
- {
- AutoJobRecorder.UpdatePosition(wafer2.WaferID.ToString(), ModuleName.Buffer.ToString(), "Abort");
- }
+ var wafer2 = WaferManager.Instance.GetWafer(ModuleName.Buffer, 0);
+ if (wafer2 != null && wafer2.WaferID != null)
+ {
+ AutoJobRecorder.UpdatePosition(wafer2.WaferID.ToString(), ModuleName.Buffer.ToString(), "Abort");
+ }
- var wafer3 = WaferManager.Instance.GetWafer(ModuleName.LoadLock, 0);
- if (wafer3 != null)
+ var wafer3 = WaferManager.Instance.GetWafer(ModuleName.LoadLock, 0);
+ if (wafer3 != null && wafer3.WaferID != null)
+ {
+ AutoJobRecorder.UpdatePosition(wafer3.WaferID.ToString(), ModuleName.LoadLock.ToString(), "Abort");
+ }
+
+ var cjList = _lstControlJobs.FindAll(c => c.State == EnumControlJobState.Executing);
+ if (cjList != null)
+ {
+ foreach (var cj in cjList)
+ {
+ GemManager.Instance.Equipment?.TriggerEvent("JobAbort", new string[] { "LotID" }, new object[] { cj.LotName });
+ }
+ }
+ }
+ catch (Exception ex)
{
- AutoJobRecorder.UpdatePosition(wafer3.WaferID.ToString(), ModuleName.LoadLock.ToString(), "Abort");
+ LOG.Error(ex.Message, ex);
}
}
@@ -988,7 +1004,7 @@ namespace SicRT.Modules
cj.SetState(EnumControlJobState.Executing);
- GemManager.Instance.Equipment?.TriggerEvent("JobStarted", new string[] { "LotID" }, new object[] { cj.LotName });
+ GemManager.Instance.Equipment?.TriggerEvent("JobStart", new string[] { "LotID" }, new object[] { cj.LotName });
}
}
}
@@ -1671,7 +1687,7 @@ namespace SicRT.Modules
_loadWaferInfo.Remove(_load.GetWaferInfo(0).WaferInnerID.ToString());
- GemManager.Instance.Equipment?.TriggerEvent("JobCompleted", new string[] { "LotID" }, new object[] { _load.GetWaferInfo(0).LotId });
+ GemManager.Instance.Equipment?.TriggerEvent("JobComplete", new string[] { "LotID" }, new object[] { _load.GetWaferInfo(0).LotId });
return;
}
diff --git a/SicRT/Equipments/Systems/EquipmentManager.cs b/SicRT/Equipments/Systems/EquipmentManager.cs
index 9c34dd6..1752d1e 100644
--- a/SicRT/Equipments/Systems/EquipmentManager.cs
+++ b/SicRT/Equipments/Systems/EquipmentManager.cs
@@ -893,9 +893,10 @@ namespace SicRT.Equipments.Systems
if (FsmState == (int)RtState.AutoRunning)
{
- _auto.Clear();
_auto.Abort();
+ _auto.Clear();
}
+
foreach (var modulesValue in Modules.Values)
{
if (!modulesValue.Module.Contains("PM"))
diff --git a/SicUI/MainViewModel.cs b/SicUI/MainViewModel.cs
index 1983b60..6df1954 100644
--- a/SicUI/MainViewModel.cs
+++ b/SicUI/MainViewModel.cs
@@ -33,6 +33,7 @@ using MECF.Framework.UI.Client.ClientBase.Dialog;
using MECF.Framework.UI.Client.Core;
using MECF.Framework.UI.Client.Ctrlib.Controls;
using MECF.Framework.Common.MECF.Framework.Common.SCCore;
+using MECF.Framework.Common.OperationCenter;
namespace SicUI.Client
{
@@ -847,6 +848,8 @@ namespace SicUI.Client
{
RequestLogin("admin", new PasswordBox() { Password = "admin" }, new Role("0", "Manager", false, 1000, null));
}
+
+ InvokeClient.Instance.Service.DoOperation("GEM_SetSoftwareVersion", SoftwareVersion);
}
protected override void OnActivate()
diff --git a/SicUI/Models/Operations/Gem/GemView.xaml b/SicUI/Models/Operations/Gem/GemView.xaml
index ede9abd..b452b38 100644
--- a/SicUI/Models/Operations/Gem/GemView.xaml
+++ b/SicUI/Models/Operations/Gem/GemView.xaml
@@ -436,11 +436,11 @@
-
+
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll
index 271c5b8..815d5c1 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
index c6c3adf..1e1c006 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
index 4db471e..1fc3e82 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
index ec5a226..0ef4429 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
index 0a4884e..079246b 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
index 1bc1624..8a9ef4d 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
index 34b869d..40af902 100644
Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ