控压结束动作bug修复

Venus/Venus_MainPages/ViewModels/EventViewModel.cs

@@ -12,6 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Venus_Core;
 using Venus_MainPages.Unity;
 using Venus_MainPages.Views;
 
@@ -328,7 +329,12 @@ namespace Venus_MainPages.ViewModels
                         this.SearchBeginTime = this.view.wfTimeFrom.Value;
                         this.SearchEndTime = this.view.wfTimeTo.Value;
 
-                        string test = $"SELECT COUNT(*) FROM \"event_data\" where \"occur_time\" >='{SearchBeginTime.ToString("yyyy/MM/dd HH:mm:ss")}' and \"occur_time\" <='{SearchEndTime.ToString("yyyyMMdd HHmmss")}';";
+                        string test = $"SELECT COUNT(*) FROM \"event_data\" where \"occur_time\" >='{SearchBeginTime.ToString("yyyy/MM/dd HH:mm:ss")}' and \"occur_time\" <='{SearchEndTime.ToString("yyyyMMdd HHmmss")}'";
+                        test += " and (FALSE ";
+                        if (SearchAlarmEvent) test += " OR \"level\"='Alarm' ";
+                        if (SearchWarningEvent) test += " OR \"level\"='Warning' ";
+                        if (SearchInfoEvent) test += " OR \"level\"='Information' ";
+                        test += " ) ";
                         Total = QueryDataClient.Instance.Service.GetDBEventAllCount(test);
 
                         PageCount = (Total / m_onePageCounts) + 1;

Venus/Venus_RT/Devices/JetKepler2300PM.cs

@@ -1209,11 +1209,5 @@ namespace Venus_RT.Devices
         {
             return CheckSlitDoorClose();
         }
-
-        public override bool ControlPressureSwitchToProcess()
-        {
-            OpenValve(ValveType.Mfc6, false);
-            return true;
-        }
     }
 }

Venus/Venus_RT/Devices/JetPMBase.cs

@@ -586,9 +586,5 @@ namespace Venus_RT.Devices
         {
             return false;
         }
-        public virtual bool ControlPressureSwitchToProcess()
-        {
-            return true;
-        }
     }
 }

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -20,7 +20,6 @@ namespace Venus_RT.Modules.PMs
     {
         private enum ProcessStep
         {
-            kControlPressureSwitchProcess,
             kDelay_1s,
             kPreparePressure,
             kPrepareTemperature,
@@ -271,7 +270,7 @@ namespace Venus_RT.Modules.PMs
         public RState Monitor()
         {
           Runner
-                
+                .Delay(ProcessStep.kDelay_1s,1000)
                 .Run(ProcessStep.kPreparePressure, PreparePressure, IsPressureReady)
                 .Run(ProcessStep.kPrepareTemperature, PrepareTemp, IsTempReady)
                 .Run(ProcessStep.kRunRecipes, StartNewRecipe, RunRecipes, 5 * 60 * 60 * 1000)
@@ -280,10 +279,6 @@ namespace Venus_RT.Modules.PMs
             return Runner.Status;
         }
 
-        private bool ControlPressureSwitchProcess()
-        {
-            return _chamber.ControlPressureSwitchToProcess();
-        }
         private bool PreparePressure()
         {
             //2023/09/02 tps remove