Browse Source

修复下手臂无法右键的问题

zhouhr 1 year ago
parent
commit
c8ec52ec1e

+ 28 - 2
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -10,8 +10,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Threading;
 using Venus_MainPages.Unity;
+using Venus_MainPages.Views;
 using Venus_Themes.CustomControls;
 using Venus_Themes.Unity;
 
@@ -387,7 +389,7 @@ namespace Venus_MainPages.ViewModels
         }
         private void OnUnLoadWafer(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.Unload", ModuleManager.ModuleInfos[obj.ToString()].ModuleID);
+            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.UnLoad", ModuleManager.ModuleInfos[obj.ToString()].ModuleID);
         }
         private void OnSelectAll(object obj)
         {
@@ -434,8 +436,32 @@ namespace Venus_MainPages.ViewModels
         }
         private void OnReturnAllWafer()
         {
+            //Dialog
+            WaferDialogView dialog = new WaferDialogView()
+            {
+                Owner = Application.Current.MainWindow,
+            }; 
+            dialog.Left = Application.Current.MainWindow.Width / 2 - 150;
+            dialog.Top = Application.Current.MainWindow.Height / 2 - 200;
+            dialog.Height = 300;
+            dialog.Width = 400;
+            double angel = 0;
+            double coolingtime = 0;
+            if (dialog.ShowDialog() == true)
+            {
+                if ((bool)dialog.AlignFlag == true && !string.IsNullOrEmpty(dialog.Angle))
+                {
+                   angel = Convert.ToDouble(dialog.Angle);
+                }
 
-            InvokeClient.Instance.Service.DoOperation("ReturnWafer");
+                if ((bool)dialog.CoolingFlag == true && !string.IsNullOrEmpty(dialog.CoolingTime))
+                {
+                    coolingtime = Convert.ToDouble(dialog.CoolingTime);
+                }
+
+                InvokeClient.Instance.Service.DoOperation("System.ReturnAllWafer", dialog.CoolingFlag,coolingtime, dialog.AlignFlag, angel);
+            }
+            
         }
         private void OnSetSequence()
         {

+ 1 - 1
Venus/Venus_RT/Config/System.sccfg

@@ -15,7 +15,7 @@
 		<config default="true" name="DisplayPopDialogWhenJobComplete" nameView="Pop Dialog When Job Complete" description="是否弹出Job结束对话框" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="100" name="PMLLMaxPressureDifference" nameView="Max PM/LL Pressure difference for open slit valve" description="" max="500" min="20" paramter="" tag="" unit="mtorr" type="Double" />
 		<config default="100" name="TMLLMaxPressureDifference" nameView="Max TM/LL Pressure difference for open slit valve" description="" max="500" min="20" paramter="" tag="" unit="mtorr" type="Double" />
-		<config default="LLA,PMA" name="InstalledModules" description="安装的模块" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
+		<config default="LLA,PMA,EfemRobot" name="InstalledModules" description="安装的模块" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
 		<config default="2" name="MaxInternalWaferCount" nameView="Max Internal wafer count" description="系统可允许进入的wafer数" max="8" min="1" paramter="" tag="" unit="" visible="true" type="Integer" />		
 		<config default="00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000" name="COMLogFlag" description="Flag for print COM data log" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
 

File diff suppressed because it is too large
+ 1 - 1
Venus/Venus_Themes/UserControls/EFEMFrontView.xaml