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

Merge branch 'Sic8ToSic6' into 整理机台兼容内容 

# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMViewModel.cs
#	SicUI/Properties/AssemblyInfo.cs
This commit is contained in:
Han Qiang Qiang 2023-11-30 15:01:05 +08:00
parent 455f1b12d0 d8f57ef65a
commit e3cf692db9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SicUI/Models/Maintenances/TM/EFEMViewModel.cs
View File

@ -293,9 +293,9 @@ namespace SicUI.Models.Maintenances.TM
cSlot = 0;
}
if((TraySelectedModule == "CassBL" && !IsOnlineCassBL) || (TraySelectedModule == "LoadLock" && !IsOnlineLoad))
if ((TraySelectedModule == "CassBL" && !IsOnlineCassBL) || (TraySelectedModule == "LoadLock" && !IsOnlineLoad))
{
InvokeClient.Instance.Service.DoOperation($"TrayRobot.PickTray", TraySelectedModule, cSlot);
InvokeClient.Instance.Service.DoOperation($"TrayRobot.PickTray", TraySelectedModule, cSlot);
}
}
public void TrayRobotPlaceRoutine()
@ -315,6 +315,7 @@ namespace SicUI.Models.Maintenances.TM
InvokeClient.Instance.Service.DoOperation($"TrayRobot.PlaceTray", TraySelectedModule, cSlot);
}
}
public void TrayRobotMapRoutine()
{
if (string.IsNullOrEmpty(TraySelectedModule))

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -54,5 +54,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.3.7")]
[assembly: AssemblyVersion("1.1.4.8")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]