Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

1.Gem优化

This commit is contained in:
HCL 2024-05-30 17:47:43 +08:00
parent 12d0025c40
commit ae5673dcfe
12 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
SicRT/Config/Gem.exml
View File

@ -662,44 +662,44 @@
<!-- Alarm-->
<!-- 编号预留100个-->
<Event Connection="*" Name="SystemAlarm_SET" Id="3010001" Description="SystemAlarm set event" Variables="System.AlarmInfo" />
<Event Connection="*" Name="SystemAlarm_CLEAR" Id="3010002" Description="SystemAlarm clear event" Variables=""/>
<Event Connection="*" Name="SystemAlarm_CLEAR" Id="3010002" Description="SystemAlarm clear event" Variables="System.AlarmInfo"/>
<Event Connection="*" Name="LoadAlarm_SET" Id="3010003" Description="LoadAlarm set event" Variables="Load.AlarmInfo" />
<Event Connection="*" Name="LoadAlarm_CLEAR" Id="3010004" Description="LoadAlarm clear event" Variables=""/>
<Event Connection="*" Name="LoadAlarm_CLEAR" Id="3010004" Description="LoadAlarm clear event" Variables="Load.AlarmInfo"/>
<Event Connection="*" Name="LoadLockAlarm_SET" Id="3010005" Description="LoadLockAlarm set event" Variables="LoadLock.AlarmInfo" />
<Event Connection="*" Name="LoadLockAlarm_CLEAR" Id="3010006" Description="LoadLockAlarm clear event" Variables=""/>
<Event Connection="*" Name="LoadLockAlarm_CLEAR" Id="3010006" Description="LoadLockAlarm clear event" Variables="LoadLock.AlarmInfo"/>
<Event Connection="*" Name="BufferAlarm_SET" Id="3010007" Description="BufferAlarm set event" Variables="Buffer.AlarmInfo" />
<Event Connection="*" Name="BufferAlarm_CLEAR" Id="3010008" Description="BufferAlarm clear event" Variables=""/>
<Event Connection="*" Name="BufferAlarm_CLEAR" Id="3010008" Description="BufferAlarm clear event" Variables="Buffer.AlarmInfo"/>
<Event Connection="*" Name="TMAlarm_SET" Id="3010009" Description="TMAlarm set event" Variables="TM.AlarmInfo" />
<Event Connection="*" Name="TMAlarm_CLEAR" Id="3010010" Description="TMAlarm clear event" Variables=""/>
<Event Connection="*" Name="TMAlarm_CLEAR" Id="3010010" Description="TMAlarm clear event" Variables="TM.AlarmInfo"/>
<Event Connection="*" Name="PM1Alarm_SET" Id="3010011" Description="PM1Alarm set event" Variables="PM1.AlarmInfo" />
<Event Connection="*" Name="PM1Alarm_CLEAR" Id="3010012" Description="PM1Alarm clear event" Variables=""/>
<Event Connection="*" Name="PM1Alarm_CLEAR" Id="3010012" Description="PM1Alarm clear event" Variables="PM1.AlarmInfo"/>
<Event Connection="*" Name="PM2Alarm_SET" Id="3010013" Description="PM2Alarm set event" Variables="PM2.AlarmInfo" />
<Event Connection="*" Name="PM2Alarm_CLEAR" Id="3010014" Description="PM2Alarm clear event" Variables=""/>
<Event Connection="*" Name="PM2Alarm_CLEAR" Id="3010014" Description="PM2Alarm clear event" Variables="PM2.AlarmInfo"/>
<!-- Job-->
<!-- 编号预留100个-->
<Event Connection="*" Name="JobStarted" Id="3010101" Description="Job Started" Variables="" />
<Event Connection="*" Name="JobCompleted" Id="3010102" Description="Job Completed" Variables="" />
<Event Connection="*" Name="JobAborted" Id="3010103" Description="Job Aborted" Variables="" />
<Event Connection="*" Name="JobStart" Id="3010101" Description="Job Start,assoicated LotID Variable" Variables="LotID" />
<Event Connection="*" Name="JobComplete" Id="3010102" Description="Job Complete,assoicated LotID Variable" Variables="LotID" />
<Event Connection="*" Name="JobAbort" Id="3010103" Description="Job Abort,assoicated LotID Variable" Variables="LotID" />
</Events>
<Alarms>
<!-- 编号预留100个-->
<!-- ALCD: 0 = Not used, 1 = Personal safety, 2 = Equipment safety, 3 = Parameter control warning, 4 = Parameter control error, 5 = Irrecoverable error, 6 = Equipment status warning, 7 = Attention flags, 8 = Data integrity, >8 = Other categories -->
<Alarm Name="SystemAlarm" ALTX="System Alarm" ALCD="2" ALID="4010001" SetEvent="SystemAlarm_SET" ClearEvent="SystemAlarm_CLEAR" Description="System alarm occurred" />
<Alarm Name="LoadAlarm" ALTX="Load Alarm" ALCD="2" ALID="4010002" SetEvent="LoadAlarm_SET" ClearEvent="LoadAlarm_CLEAR" Description="Load alarm occurred" />
<Alarm Name="LoadLockAlarm" ALTX="LoadLock Alarm" ALCD="2" ALID="4010003" SetEvent="LoadLockAlarm_SET" ClearEvent="LoadLockAlarm_CLEAR" Description="LoadLock alarm occurred" />
<Alarm Name="BufferAlarm" ALTX="Buffer Alarm" ALCD="2" ALID="4010004" SetEvent="BufferAlarm_SET" ClearEvent="BufferAlarm_CLEAR" Description="Buffer alarm occurred" />
<Alarm Name="TMAlarm" ALTX="TM Alarm" ALCD="2" ALID="4010005" SetEvent="TMAlarm_SET" ClearEvent="TMAlarm_CLEAR" Description="TM alarm occurred" />
<Alarm Name="PM1Alarm" ALTX="PM1 Alarm" ALCD="2" ALID="4010006" SetEvent="PM1Alarm_SET" ClearEvent="PM1Alarm_CLEAR" Description="PM1 alarm occurred" />
<Alarm Name="PM2Alarm" ALTX="PM2 Alarm" ALCD="2" ALID="4010007" SetEvent="PM2Alarm_SET" ClearEvent="PM2Alarm_CLEAR" Description="PM2 alarm occurred" />
<Alarm Name="System.Alarm" ALTX="System Alarm" ALCD="2" ALID="4010001" SetEvent="SystemAlarm_SET" ClearEvent="SystemAlarm_CLEAR" Description="System alarm occurred,assoicated System.AlarmInfo Variable" />
<Alarm Name="Load.Alarm" ALTX="Load Alarm" ALCD="2" ALID="4010002" SetEvent="LoadAlarm_SET" ClearEvent="LoadAlarm_CLEAR" Description="Load alarm occurred,assoicated Load.AlarmInfo Variable" />
<Alarm Name="LoadLock.Alarm" ALTX="LoadLock Alarm" ALCD="2" ALID="4010003" SetEvent="LoadLockAlarm_SET" ClearEvent="LoadLockAlarm_CLEAR" Description="LoadLock alarm occurred,assoicated LoadLock.AlarmInfo Variable" />
<Alarm Name="Buffer.Alarm" ALTX="Buffer Alarm" ALCD="2" ALID="4010004" SetEvent="BufferAlarm_SET" ClearEvent="BufferAlarm_CLEAR" Description="Buffer alarm occurred,assoicated Buffer.AlarmInfo Variable" />
<Alarm Name="TM.Alarm" ALTX="TM Alarm" ALCD="2" ALID="4010005" SetEvent="TMAlarm_SET" ClearEvent="TMAlarm_CLEAR" Description="TM alarm occurred,assoicated TM.AlarmInfo Variable" />
<Alarm Name="PM1.Alarm" ALTX="PM1 Alarm" ALCD="2" ALID="4010006" SetEvent="PM1Alarm_SET" ClearEvent="PM1Alarm_CLEAR" Description="PM1 alarm occurred,assoicated PM1.AlarmInfo Variable" />
<Alarm Name="PM2.Alarm" ALTX="PM2 Alarm" ALCD="2" ALID="4010007" SetEvent="PM2Alarm_SET" ClearEvent="PM2Alarm_CLEAR" Description="PM2 alarm occurred,assoicated PM2.AlarmInfo Variable" />
</Alarms>

54
SicRT/Equipments/AutoTransfer.cs
View File

@ -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;
}

3
SicRT/Equipments/Systems/EquipmentManager.cs
View File

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

3
SicUI/MainViewModel.cs
View File

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

4
SicUI/Models/Operations/Gem/GemView.xaml
View File

@ -436,11 +436,11 @@
<TextBlock Margin="5,5,5,2" Text="5. START(S2F21)" />
<TextBlock Margin="5,0,5,5" Text="无参数" />
<TextBlock Margin="5,5,5,2" Text="6. ABORT(S2F21)" />
<!--<TextBlock Margin="5,5,5,2" Text="6. ABORT(S2F21)" />
<TextBlock Margin="5,0,5,5" Text="无参数" />
<TextBlock Margin="5,5,5,2" Text="7. STOP(S2F21)" />
<TextBlock Margin="5,0,5,5" Text="无参数" />
<TextBlock Margin="5,0,5,5" Text="无参数" />-->
</StackPanel>
</Grid>

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll vendored
View File

Binary file not shown.