Sic-Software
/
Sic.Framework-Nanjing-Baishi
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

1.WaferTrayStatus改为TrayStatus

This commit is contained in:
HCL 2024-03-12 14:16:59 +08:00
parent be92a68f1e
commit 97e5b688a2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MECF.Framework.UI.Client/ClientBase/ModuleDataMonitor.cs
View File

@ -96,7 +96,7 @@ namespace MECF.Framework.UI.Client.ClientBase
{
info.WaferManager.Wafers[i].SourceName = convertedWafer.SourceName;
}
info.WaferManager.Wafers[i].WaferTrayStatus = convertedWafer.WaferTrayStatus;
info.WaferManager.Wafers[i].TrayStatus = convertedWafer.TrayStatus;
info.WaferManager.Wafers[i].LotID = convertedWafer.LotID;
info.WaferManager.Wafers[i].IsTrayExhausted = wafers[index].TrayProcessCount <= 0;
info.WaferManager.Wafers[i].TrayProcessCount = wafers[index].TrayProcessCount;
@ -152,7 +152,7 @@ namespace MECF.Framework.UI.Client.ClientBase
wafer.SourceName = awafer.WaferOrigin;
wafer.LotID = awafer.LotId == "" ? awafer.WaferOrigin : awafer.LotId;
wafer.WaferStatus = WaferStatusConverter(awafer);
wafer.WaferTrayStatus = (int)awafer.TrayStatus; //awafer.TrayState == RTDefine.WaferTrayStatus.Normal ? 1 : 0;
wafer.TrayStatus = (int)awafer.TrayStatus; //awafer.TrayState == RTDefine.TrayStatus.Normal ? 1 : 0;
wafer.RecipeName = "";
if (awafer.ProcessJob != null && awafer.ProcessJob.Sequence != null)
{

2
MECF.Framework.UI.Client/ClientBase/WaferInfo.cs
View File

@ -14,7 +14,7 @@ namespace MECF.Framework.UI.Client.ClientBase
}
private int _waferTrayStatus = 0;
public int WaferTrayStatus
public int TrayStatus
{
get => _waferTrayStatus;
set { _waferTrayStatus = value; NotifyOfPropertyChange(); }

4
MECF.Framework.UI.Client/Ctrlib/UnitControls/FOUPFrontView.xaml
View File

@ -121,12 +121,12 @@
ToolTip="{Binding ToolTip}"
ToolTipService.ShowOnDisabled="True"
TrayProcessCount="{Binding TrayProcessCount}"
TrayStatus="{Binding WaferTrayStatus}"
TrayStatus="{Binding TrayStatus}"
ViewType="Front">
<controls:Slot.WaferStatus>
<MultiBinding Converter="{StaticResource WaferTrayStatusConvert}">
<Binding Path="WaferStatus" />
<Binding Path="WaferTrayStatus" />
<Binding Path="TrayStatus" />
</MultiBinding>
</controls:Slot.WaferStatus>
<i:Interaction.Triggers>

12
MECF.Framework.UI.Client/SicModuleUIViewModelBase.cs
View File

@ -121,7 +121,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}
@ -133,7 +133,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}
@ -145,7 +145,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}
@ -157,7 +157,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}
@ -169,7 +169,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}
@ -181,7 +181,7 @@ namespace MECF.Framework.UI.Client
{
get
{
if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].WaferTrayStatus > 0)
if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].TrayStatus > 0)
{
return Visibility.Visible;
}