Browse Source

fix 添加确认弹窗操作

jiangjy 2 weeks ago
parent
commit
60d54470a2

+ 2 - 2
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeSelectDialogView.xaml

@@ -89,7 +89,7 @@
 
             </Border>
             <StackPanel Grid.Row="1" Margin="0,10,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Content="OK" >
+                <Button Content="OK"  Width="100" Height="50">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
                             <micro:ActionMessage MethodName="OK">
@@ -97,7 +97,7 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                 </Button>
-                <Button Content="Cancel" Margin="10,0,0,0">
+                <Button Content="Cancel" Margin="10,0,0,0"  Width="100" Height="50">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
                             <micro:ActionMessage MethodName="Cancel">

+ 15 - 6
Furnace/FurnaceUI/Views/Maintenances/FIMSSensorViewModel.cs

@@ -16,13 +16,14 @@ using Aitex.Core.RT.Log;
 using System.Linq;
 using System.Windows;
 using MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig;
+using OpenSEMI.ClientBase;
 
 namespace FurnaceUI.Views.Maintenances
 {
     public class FIMSSensorViewModel : FurnaceUIViewModelBase
     {
         public bool IsPermission { get => this.Permission == 3; }
-       
+
 
         public bool IsSystemStaus => (RtStatus != "AutoRunning");
         [Subscription("FIMS1.Status")]
@@ -46,23 +47,31 @@ namespace FurnaceUI.Views.Maintenances
 
         public void Home(object target)
         {
-            InvokeClient.Instance.Service.DoOperation($"{target}.Home");
+            if (DialogBox.Confirm($"Are you sure you want to {target} Home?"))
+                InvokeClient.Instance.Service.DoOperation($"{target}.Home");
         }
 
         public void Load(object target)
         {
-            var valueConfig = SystemConfigProvider.Instance.GetValueByName("PM1.N2Purge.WaferCharge.FOUPN2PurgeEnable");
-            InvokeClient.Instance.Service.DoOperation($"{target}.Load", new object[] { valueConfig });
+            if (DialogBox.Confirm($"Are you sure you want to {target} Load?"))
+            {
+                var valueConfig = SystemConfigProvider.Instance.GetValueByName("PM1.N2Purge.WaferCharge.FOUPN2PurgeEnable");
+                InvokeClient.Instance.Service.DoOperation($"{target}.Load", new object[] { valueConfig });
+
+            }
+     
         }
 
         public void Unload(object target)
         {
-            InvokeClient.Instance.Service.DoOperation($"{target}.Unload");
+            if (DialogBox.Confirm($"Are you sure you want to {target} Unload?"))
+                InvokeClient.Instance.Service.DoOperation($"{target}.Unload");
         }
 
         public void SetAlarmReset(object target)
         {
-            InvokeClient.Instance.Service.DoOperation($"{target?.ToString().Split('.').ToList().LastOrDefault()}.Reset");
+            if (DialogBox.Confirm($"Are you sure you want to {target} Reset?"))
+                InvokeClient.Instance.Service.DoOperation($"{target?.ToString().Split('.').ToList().LastOrDefault()}.Reset");
         }
         public void SetOnline(object target)
         {

+ 17 - 7
Furnace/FurnaceUI/Views/Operations/TransferMain/CassetteRobotViewModel.cs

@@ -15,6 +15,7 @@ using System;
 using Aitex.Core.RT.Log;
 using System.Linq;
 using System.Windows;
+using OpenSEMI.ClientBase;
 
 namespace FurnaceUI.Views.Maintenances
 {
@@ -88,7 +89,7 @@ namespace FurnaceUI.Views.Maintenances
             }
         }
 
-        private int _pickSelectedSlotCassetteRobot=1;
+        private int _pickSelectedSlotCassetteRobot = 1;
         public int PickSelectedSlotCassetteRobot
         {
             get { return _pickSelectedSlotCassetteRobot; }
@@ -121,7 +122,7 @@ namespace FurnaceUI.Views.Maintenances
             }
         }
 
-        private int _placeSelectedSlotCassetteRobot=1;
+        private int _placeSelectedSlotCassetteRobot = 1;
         public int PlaceSelectedSlotCassetteRobot
         {
             get { return _placeSelectedSlotCassetteRobot; }
@@ -254,19 +255,28 @@ namespace FurnaceUI.Views.Maintenances
 
         public void CassetteRobot_Pick()
         {
+
             var module = _modulesDic.ContainsKey(PickSelectedModuleCassetteRobot) ? _modulesDic[PickSelectedModuleCassetteRobot] : PickSelectedModuleCassetteRobot;
-            InvokeClient.Instance.Service.DoOperation($"CarrierRobot.Pick", module, PickSelectedSlotCassetteRobot - 1, PickSelectedBladeCassetteRobot == "Blade1" ? 0 : (PickSelectedBladeCassetteRobot == "Blade2" ? 1 : 2));
+            if (DialogBox.Confirm($"Are you sure you want to  Pick {module} foup?"))
+            {
+                InvokeClient.Instance.Service.DoOperation($"CarrierRobot.Pick", module, PickSelectedSlotCassetteRobot - 1, PickSelectedBladeCassetteRobot == "Blade1" ? 0 : (PickSelectedBladeCassetteRobot == "Blade2" ? 1 : 2));
+
+            }
         }
 
         public void CassetteRobot_Place()
         {
+         
             var module = _modulesDic.ContainsKey(PlaceSelectedModuleCassetteRobot) ? _modulesDic[PlaceSelectedModuleCassetteRobot] : PlaceSelectedModuleCassetteRobot;
-            InvokeClient.Instance.Service.DoOperation($"CarrierRobot.Place", module, PlaceSelectedSlotCassetteRobot - 1, PlaceSelectedBladeCassetteRobot == "Blade1" ? 0 : (PlaceSelectedBladeCassetteRobot == "Blade2" ? 1 : 2));
+            if (DialogBox.Confirm($"Are you sure you want to  place to  {module} ?"))
+            {
+                InvokeClient.Instance.Service.DoOperation($"CarrierRobot.Place", module, PlaceSelectedSlotCassetteRobot - 1, PlaceSelectedBladeCassetteRobot == "Blade1" ? 0 : (PlaceSelectedBladeCassetteRobot == "Blade2" ? 1 : 2));
+            }
         }
         public void CassetteRobot_CycleSwap()
         {
-         
-         
+
+
             var cyclenum = (int)QueryDataClient.Instance.Service.GetConfig("CarrierRobot.RunToRunNumber"); ;
             var fromModule = _modulesDic.ContainsKey(CycleSwapFromSelectedModuleCassetteRobot) ? _modulesDic[CycleSwapFromSelectedModuleCassetteRobot] : CycleSwapFromSelectedModuleCassetteRobot;
             var toModule = _modulesDic.ContainsKey(CycleSwapToSelectedModuleCassetteRobot) ? _modulesDic[CycleSwapToSelectedModuleCassetteRobot] : CycleSwapToSelectedModuleCassetteRobot;
@@ -277,7 +287,7 @@ namespace FurnaceUI.Views.Maintenances
                 MessageBox.Show("The From cannot  equal to To");
                 return;
             }
-            InvokeClient.Instance.Service.DoOperation($"CarrierRobot.CycleSwap", fromModule, toModule, 0, 0,cyclenum);
+            InvokeClient.Instance.Service.DoOperation($"CarrierRobot.CycleSwap", fromModule, toModule, 0, 0, cyclenum);
         }
         public void CassetteRobot_Swap()
         {

+ 12 - 7
Furnace/FurnaceUI/Views/Operations/TransferMain/SelfCheckViewModel.cs

@@ -17,6 +17,7 @@ using FurnaceUI.Client;
 using Caliburn.Micro;
 using Caliburn.Micro.Core;
 using FurnaceUI.Views.Maintenances;
+using OpenSEMI.ClientBase;
 
 namespace FurnaceUI.Views.Operations
 {
@@ -1360,15 +1361,18 @@ namespace FurnaceUI.Views.Operations
         }
         public void DeleteWafer()
         {
-            InvokeClient.Instance.Service.DoOperation("System.DeleteAllWafer");
+            if (DialogBox.Confirm("Are you sure you want to DeleteAllWafer?"))
+                InvokeClient.Instance.Service.DoOperation("System.DeleteAllWafer");
         }
         public void DeleteCarrier()
         {
-            InvokeClient.Instance.Service.DoOperation("System.DeleteAllCarrier");
+            if (DialogBox.Confirm("Are you sure you want to DeleteAllCarrier?"))
+                InvokeClient.Instance.Service.DoOperation("System.DeleteAllCarrier");
         }
         public void Reset()
         {
-            InvokeClient.Instance.Service.DoOperation("System.Reset");
+            if (DialogBox.Confirm("Are you sure you want to Reset?"))
+                InvokeClient.Instance.Service.DoOperation("System.Reset");
         }
 
         public void ManualOperation(string deviceName)
@@ -1453,11 +1457,11 @@ namespace FurnaceUI.Views.Operations
                 case "CassetteRobot":
                     CassetteRobotViewModel cassetteRobotViewModel = new CassetteRobotViewModel();
                     cassetteRobotViewModel.SystemName = "SMIFA";
-                    (windowManager as WindowManager)?.ShowDialogWithTitle(cassetteRobotViewModel, this, null, "CassetteRobot Status");
+                    (windowManager as WindowManager)?.ShowDialogWithTitle(cassetteRobotViewModel, this, null, "FTR Operate");
                     break;
                 case "WaferRobot":
                     WaferRobotViewModel waferRobotViewModel = new WaferRobotViewModel();
-                    (windowManager as WindowManager)?.ShowDialogWithTitle(waferRobotViewModel, this, null, "WaferRobot Status");
+                    (windowManager as WindowManager)?.ShowDialogWithTitle(waferRobotViewModel, this, null, "WTR Operate");
                     break;
                 case "Stage":
                     StageSensorViewModel stageSensorViewModel = new StageSensorViewModel();
@@ -1469,7 +1473,7 @@ namespace FurnaceUI.Views.Operations
                     break;
                 case "Boat":
                     BoatSensorViewModel boatSensorViewModel = new BoatSensorViewModel();
-                    (windowManager as WindowManager)?.ShowDialogWithTitle(boatSensorViewModel, this, null, "Boat Status");
+                    (windowManager as WindowManager)?.ShowDialogWithTitle(boatSensorViewModel, this, null, "Boat Operate");
                     break;
                 default:
                     break;
@@ -1538,7 +1542,8 @@ namespace FurnaceUI.Views.Operations
         }
         public void ReturnWafer()
         {
-            InvokeClient.Instance.Service.DoOperation("System.ReturnAllWafer");
+            if (DialogBox.Confirm("Are you sure you want to ReturnAllWafer?"))
+                InvokeClient.Instance.Service.DoOperation("System.ReturnAllWafer");
         }
     }
 }

+ 17 - 4
Furnace/FurnaceUI/Views/Operations/TransferMain/WaferRobotViewModel.cs

@@ -19,6 +19,7 @@ using System.Windows;
 using MECF.Framework.Common.SubstrateTrackings;
 using MECF.Framework.Common.Equipment;
 using System.Text.RegularExpressions;
+using OpenSEMI.ClientBase;
 
 namespace FurnaceUI.Views.Maintenances
 {
@@ -38,7 +39,7 @@ namespace FurnaceUI.Views.Maintenances
 
         [Subscription("WaferRobot.IsOnline")]
         public bool WaferRobotIsOnline { get; set; }
-        public bool IsWaferRobotOfflineButtonEnable => WaferRobotIsOnline ;
+        public bool IsWaferRobotOfflineButtonEnable => WaferRobotIsOnline;
         public bool IsWaferRobotOnlineButtonEnable => !WaferRobotIsOnline;
 
         #region test TMRobot
@@ -238,18 +239,30 @@ namespace FurnaceUI.Views.Maintenances
 
         public void TMRobot_Pick()
         {
+
             var module = PickSelectedModuleTMRobot.Replace("Boat", "PM1");
-            InvokeClient.Instance.Service.DoOperation($"WaferRobot.Pick", module, PickSelectedSlotTMRobot - 1, PickSelectedBladeTMRobot == "Single" ? 0 : (PickSelectedBladeTMRobot == "Blade2" ? 1 : 2));
+            if (DialogBox.Confirm($"Are you sure you want to  Pick Wafer?"))
+            {
+                InvokeClient.Instance.Service.DoOperation($"WaferRobot.Pick", module, PickSelectedSlotTMRobot - 1, PickSelectedBladeTMRobot == "Single" ? 0 : (PickSelectedBladeTMRobot == "Blade2" ? 1 : 2));
+
+            }
         }
 
         public void TMRobot_Place()
         {
-            var module = PlaceSelectedModuleTMRobot.Replace("Boat", "PM1");
-            InvokeClient.Instance.Service.DoOperation($"WaferRobot.Place", module, PlaceSelectedSlotTMRobot - 1, PlaceSelectedBladeTMRobot == "Single" ? 0 : (PlaceSelectedBladeTMRobot == "Blade2" ? 1 : 2));
+            if (DialogBox.Confirm($"Are you sure you want to  place Wafer?"))
+            {
+                var module = PlaceSelectedModuleTMRobot.Replace("Boat", "PM1");
+                InvokeClient.Instance.Service.DoOperation($"WaferRobot.Place", module, PlaceSelectedSlotTMRobot - 1, PlaceSelectedBladeTMRobot == "Single" ? 0 : (PlaceSelectedBladeTMRobot == "Blade2" ? 1 : 2));
+
+            }
         }
 
         public void TMRobot_Mapping()
         {
+            if (!DialogBox.Confirm($"Are you sure you want to  Mapping Wafer?"))
+                return;
+
             var module = MappingSelectedModuleTMRobot.Replace("Boat", "PM1");
             string mappingSlot = string.Empty;
             var wafers = ModuleManager.ModuleInfos[module].WaferManager.Wafers;