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

1.去除因修改导致的报错

This commit is contained in:
HCL 2024-03-12 09:17:58 +08:00
parent de3ef38c6c
commit 7ed5c31811
7 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Aligners/HonghuAligners/FuQiAligner.cs
View File

@ -105,7 +105,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.HonghuAligners
if (WaferManager.Instance.CheckHasWafer(RobotModuleName, 0))
{
var wafer = WaferManager.Instance.GetWafer(RobotModuleName, 0);
WaferManager.Instance.UpdateWaferE90State(wafer.WaferID, EnumE90Status.Aborted);
//WaferManager.Instance.UpdateWaferE90State(wafer.WaferID, EnumE90Status.Aborted);
}
}
}

4
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/LoadPorts/LoadPort.cs
View File

@ -1318,8 +1318,8 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts
var wafers = WaferManager.Instance.GetWafers(_module);
for (int i = 0; i < wafers.Length; i++)
{
_waferId[i][1] = wafers[i].LaserMarker;
_waferId[i][2] = wafers[i].T7Code;
//_waferId[i][1] = wafers[i].LaserMarker;
//_waferId[i][2] = wafers[i].T7Code;
_waferId[i][3] = wafers[i].WaferID;
}
return _waferId;

16
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/LoadPorts/OpenStages/OpenStageHHGyy.cs
View File

@ -355,14 +355,14 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.OpenStages
continue;
if (wafer.SubstE90Status != EnumE90Status.Processed)
continue;
if (String.IsNullOrEmpty(wafer.LaserMarkerScore))
continue;
float waferscore = Convert.ToSingle(wafer.LaserMarkerScore);
if(waferscore < (float)OcrThreshold)
{
wafer.SubstE90Status = EnumE90Status.Aborted;
wafer.ProcessState = WaferProcessStatus.Failed;
}
//if (String.IsNullOrEmpty(wafer.LaserMarkerScore))
// continue;
//float waferscore = Convert.ToSingle(wafer.LaserMarkerScore);
//if(waferscore < (float)OcrThreshold)
//{
// wafer.SubstE90Status = EnumE90Status.Aborted;
// wafer.ProcessState = WaferProcessStatus.Failed;
//}
}

2
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/OcrReaders/OCRReaderBase/OCRReaderBase.cs
View File

@ -152,7 +152,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.OcrReaders
var wafer = WaferManager.Instance.GetWafer(InstalledModule, 0);
if (!wafer.IsWaferEmpty)
{
wafer.LaserMarker = CurrentLaserMark;
//wafer.LaserMarker = CurrentLaserMark;
Guid guid = Guid.NewGuid();
OCRDataRecorder.OcrReadComplete(guid.ToString(), wafer.WaferID, wafer.WaferOriginStation.ToString(),
wafer.OriginCarrierID ?? "", wafer.WaferOriginSlot.ToString(), "0", "0", true, CurrentLaserMark,

11
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Robots/HwinRobort/HwinRobot.cs
View File

@ -191,15 +191,8 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HwinRobot
_scHomeTimeout = SC.GetConfigItem($"{Module}.HomeTimeout");
_scMotionTimeout = SC.GetConfigItem($"{Module}.MotionTimeout");
if(Module == "WaferRobot")
{
WaferManager.Instance.SubscribeLocation(Module, 1, true, false);
}
else
{
WaferManager.Instance.SubscribeLocation(Module, 1, false, true);
}
WaferManager.Instance.SubscribeLocation(Module, 1);
Connection = new HwinRobotTCPConnection(deviceIP, endof);
Connection.EnableLog(_enableLog);

9
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Robots/Sunway/SunwayRobot.cs
View File

@ -195,14 +195,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
_scHomeTimeout = SC.GetConfigItem($"{Module}.HomeTimeout");
_scMotionTimeout = SC.GetConfigItem($"{Module}.MotionTimeout");
if (Module == "WaferRobot")
{
WaferManager.Instance.SubscribeLocation(Module, 1, true, false);
}
else
{
WaferManager.Instance.SubscribeLocation(Module, 1, false, true);
}
WaferManager.Instance.SubscribeLocation(Module, 1);
Connection = new SunwayRobotTCPConnection(deviceIP, endof);
Connection.EnableLog(_enableLog);

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

@ -90,7 +90,7 @@ namespace MECF.Framework.UI.Client.ClientBase
info.WaferManager.Wafers[i].WaferID = convertedWafer.WaferID;
if (wafers[index].IsWaferEmpty)
{
info.WaferManager.Wafers[i].SourceName =((ModuleName)wafers[index].TrayOriginStation).ToString()+"."+ (wafers[index].TrayOriginSlot + 1).ToString().PadLeft(2,'0');
info.WaferManager.Wafers[i].SourceName =wafers[index].TrayOriginStation+"."+ (wafers[index].TrayOriginSlot + 1).ToString().PadLeft(2,'0');
}
else
{
@ -119,12 +119,12 @@ namespace MECF.Framework.UI.Client.ClientBase
{
info.WaferManager.Wafers[i].ToolTip = new ToolTip()
{
Content = $"LotId : {wafers[index].LotId}\r\nWaferId : {wafers[index].WaferID}\r\nSequenceName : {wafers[index].ProcessJobID}\r\nWaferStatus : {((int)wafers[index].WaferStatus).ToString()}\r\nNextSequenceStep : {wafers[index].NextSequenceStep + 1}\r\nTrayState : {((int)wafers[index].TrayState).ToString()}\r\nTrayProcessCount : {wafers[index].TrayProcessCount}\r\nTrayOriginStation : {((ModuleName)wafers[index].TrayOriginStation).ToString()}\r\nTrayOriginSlot : {wafers[index].TrayOriginSlot + 1}\r\nTrayBelongTo : {_trayBelongTo}"
Content = $"LotId : {wafers[index].LotId}\r\nWaferId : {wafers[index].WaferID}\r\nSequenceName : {wafers[index].ProcessJobID}\r\nWaferStatus : {((int)wafers[index].WaferStatus).ToString()}\r\nNextSequenceStep : {wafers[index].NextSequenceStep + 1}\r\nTrayState : {((int)wafers[index].TrayState).ToString()}\r\nTrayProcessCount : {wafers[index].TrayProcessCount}\r\nTrayOriginStation : {wafers[index].TrayOriginStation}\r\nTrayOriginSlot : {wafers[index].TrayOriginSlot + 1}\r\nTrayBelongTo : {_trayBelongTo}"
};
}
else
{
info.WaferManager.Wafers[i].ToolTip.Content = $"LotId : {wafers[index].LotId}\r\nWaferId : {wafers[index].WaferID}\r\nSequenceName : {wafers[index].ProcessJobID}\r\nWaferStatus : {((int)wafers[index].WaferStatus).ToString()}\r\nNextSequenceStep : {wafers[index].NextSequenceStep + 1}\r\nTrayState : {((int)wafers[index].TrayState).ToString()}\r\nTrayProcessCount : {wafers[index].TrayProcessCount}\r\nTrayOriginStation : {((ModuleName)wafers[index].TrayOriginStation).ToString()}\r\nTrayOriginSlot : {wafers[index].TrayOriginSlot + 1}\r\nTrayBelongTo : {_trayBelongTo}";
info.WaferManager.Wafers[i].ToolTip.Content = $"LotId : {wafers[index].LotId}\r\nWaferId : {wafers[index].WaferID}\r\nSequenceName : {wafers[index].ProcessJobID}\r\nWaferStatus : {((int)wafers[index].WaferStatus).ToString()}\r\nNextSequenceStep : {wafers[index].NextSequenceStep + 1}\r\nTrayState : {((int)wafers[index].TrayState).ToString()}\r\nTrayProcessCount : {wafers[index].TrayProcessCount}\r\nTrayOriginStation : {wafers[index].TrayOriginStation}\r\nTrayOriginSlot : {wafers[index].TrayOriginSlot + 1}\r\nTrayBelongTo : {_trayBelongTo}";
}
}