Browse Source

revise lp view bug

chenzk 1 week ago
parent
commit
e5d2ca1c71

+ 1 - 1
CyberX8_MainPages/ViewModels/AlarmHomePageViewModel.cs

@@ -192,7 +192,7 @@ namespace CyberX8_MainPages.ViewModels
                     {
                         IsSelectedAlarmList = false;
                     }
-                    if (SelectedAlarmList != null && SelectedAlarmList.AlarmType == 1)
+                    if (SelectedAlarmList != null && (SelectedAlarmList.AlarmType == 1 || SelectedAlarmList.AlarmType == 2))
                     {
                         IsSelectedWarningList = true;
                     }

+ 4 - 8
CyberX8_RT/Devices/EFEM/Loadport.cs

@@ -25,7 +25,7 @@ namespace CyberX8_RT.Devices.EFEM
     sealed class Loadport : ILoadport
     {
         #region 常量 
-        private const string CASSETE_200_PRESENT= "Cassete200Present";
+        private const string CASSETE_200_PRESENT = "Cassete200Present";
         private const string CASSETE_150_PRESENT = "Cassete150Present";
         private const string CASSETE_100_PRESENT = "Cassete100Present";
         #endregion
@@ -181,7 +181,7 @@ namespace CyberX8_RT.Devices.EFEM
                 _cassete200Present = cassete;
                 if (cassete)
                 {
-                    if (_cassete150Present)
+                    if (_cassete200Present)
                     {
                         WaferSize = WaferSize.WS8;
                     }
@@ -192,14 +192,10 @@ namespace CyberX8_RT.Devices.EFEM
                 _cassete150Present = cassete;
                 if (cassete)
                 {
-                    if (!_cassete200Present)
+                    if (_cassete150Present)
                     {
                         WaferSize = WaferSize.WS6;
                     }
-                    else
-                    {
-                        WaferSize = WaferSize.WS8;
-                    }
                 }
             }
             else if (variable == CASSETE_100_PRESENT)
@@ -210,7 +206,7 @@ namespace CyberX8_RT.Devices.EFEM
                     WaferSize = WaferSize.WS4;
                 }
             }
-            if (!_cassete100Present && !_cassete150Present )
+            if (!_cassete100Present && !_cassete150Present && !_cassete200Present)
             {
                 UpdateWaferArrive(false);
             }

+ 0 - 24
CyberX8_UI/Config/UIMenu.json

@@ -313,36 +313,12 @@
 						"View": "PowerSupplierView"
 					},
 					{
-						"Id": "ReservoirCmmPowerSupplier01",
-						"ModuleName": "Reservoir1",
-						"Name": "Reservoir1",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "CMMPowerSupplierView"
-					},
-					{
 						"Id": "ReservoirCmmPowerSupplier02",
 						"ModuleName": "Reservoir2",
 						"Name": "Reservoir2",
 						"IsInit": "true",
 						"IsShow": "true",
 						"View": "CMMPowerSupplierView"
-					},
-					{
-						"Id": "ReservoirCmmPowerSupplier03",
-						"ModuleName": "Reservoir3",
-						"Name": "Reservoir3",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "CMMPowerSupplierView"
-					},
-					{
-						"Id": "ReservoirCmmPowerSupplier04",
-						"ModuleName": "Reservoir4",
-						"Name": "Reservoir4",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "CMMPowerSupplierView"
 					}
 				]
 			},