1. Change the logic of Reset RF/Pump/CustomItem count

2. add ResourceMonitor for Simulator

Venus/Framework/Common/DataCenter/StatsDataManager.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using Aitex.Core.RT.DBCore;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
 using Aitex.Core.RT.OperationCenter;
 using Aitex.Core.Util;
+using DocumentFormat.OpenXml.Vml;
+using DocumentFormat.OpenXml.Wordprocessing;
 using MECF.Framework.Common.DBCore;
 
 namespace MECF.Framework.Common.DataCenter
@@ -54,7 +57,11 @@ namespace MECF.Framework.Common.DataCenter
         {
             try
             {
-
+                OP.Subscribe("System.Stats.IncreaseValue", (method, args) => 
+                {
+                    //Increase((string)args[0], (string)args[1], (float)Convert.ToSingle(args[2]), (float)Convert.ToSingle(args[3]));
+                    return true;
+                });
                 OP.Subscribe("System.Stats.ResetValue", (method, args) => 
                 {
                     Reset((string)args[0]);
@@ -565,14 +572,24 @@ namespace MECF.Framework.Common.DataCenter
                     return -1;
                 }
                 
-                _itemsRFAndPump[name].fromLastPM = fromLastPM;
-                _itemsRFAndPump[name].Total = Total;
+                _itemsRFAndPump[name].fromLastPM += fromLastPM;
+                _itemsRFAndPump[name].Total += Total;
 
                 string sql = string.Format(
                     "UPDATE \"stats_data_rf_pump\" SET \"from_last_pm\"='{0}',\"total\"='{1}' WHERE \"name\"='{2}';",
                     _itemsRFAndPump[name].fromLastPM, _itemsRFAndPump[name].Total, name);
                 DB.Insert(sql);
 
+                _itemsRFAndPump.ToList().FindAll(x => x.Value.Description == "Follow => " + name).ForEach(item => 
+                {
+                    _itemsRFAndPump[item.Value.Name].fromLastPM += fromLastPM;
+                    _itemsRFAndPump[item.Value.Name].Total += Total;
+                    sql = string.Format(
+                   "UPDATE \"stats_data_rf_pump\" SET \"from_last_pm\"='{0}',\"total\"='{1}' WHERE \"name\"='{2}';",
+                   _itemsRFAndPump[item.Value.Name].fromLastPM, _itemsRFAndPump[item.Value.Name].Total, item.Value.Name);
+                    DB.Insert(sql);
+                });
+
                 return 0;
             }
         }

Venus/Framework/Common/Device/Bases/RfPowerBase.cs

@@ -111,7 +111,7 @@ namespace MECF.Framework.Common.Device.Bases
 
             OP.Subscribe($"{Module}.{Name}.ResetRFStats", (function, args) =>
             {
-                ResetRFStats();
+                //ResetRFStats();
                 return true;
             });
 

Venus/Venus_MainPages/Venus_MainPages.csproj.bak

@@ -22,7 +22,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168,CS0219,CS0649,CS0169,CS0414</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -45,9 +46,6 @@
     <Reference Include="ExcelLibrary">
       <HintPath>..\ThirdParty\ExcelLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="FabConnect">
-      <HintPath>..\ThirdParty\FabConnect.dll</HintPath>
-    </Reference>
     <Reference Include="LiveCharts">
       <HintPath>..\ThirdParty\LiveCharts.dll</HintPath>
     </Reference>
@@ -57,18 +55,11 @@
     <Reference Include="log4net">
       <HintPath>..\ThirdParty\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="MECF.Framework.RT.Core">
+      <HintPath>..\Framework\Output\MECF.Framework\MECF.Framework.RT.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
-    <Reference Include="OpenSEMI.ClientBase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\selfbuild\OpenSEMI.ClientBase.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenSEMI.Core">
-      <HintPath>..\ThirdParty\OpenSEMI.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenSEMI.Ctrlib">
-      <HintPath>..\ThirdParty\OpenSEMI.Ctrlib.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism">
@@ -83,10 +74,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -124,21 +111,27 @@
     <Compile Include="Converters\AllMultiValueConverter.cs" />
     <Compile Include="Converters\AllNoneCheckboxConverter.cs" />
     <Compile Include="Converters\AnyMultiValueConverter.cs" />
+    <Compile Include="Converters\BoolToHeightConverter.cs" />
+    <Compile Include="Converters\mTorrToPaConverter.cs" />
     <Compile Include="Converters\EFEMStateConverter.cs" />
     <Compile Include="Converters\EventItemToStringConverter.cs" />
     <Compile Include="Converters\HeaterToStringConverter.cs" />
+    <Compile Include="Converters\IntToPathDataConverter.cs" />
     <Compile Include="Converters\IsOnlineToOpacityConverter.cs" />
     <Compile Include="Converters\IsOnlineToColorConverter.cs" />
     <Compile Include="Converters\LLStateConverter.cs" />
+    <Compile Include="Converters\MFCConverter.cs" />
     <Compile Include="Converters\MFCErrorConverters.cs" />
     <Compile Include="Converters\MultiBindingConverter.cs" />
     <Compile Include="Converters\PMStateConverter.cs" />
     <Compile Include="Converters\SystemStateConverter.cs" />
     <Compile Include="Converters\TMStateConverter.cs" />
+    <Compile Include="Converters\VCEStateConverter.cs" />
     <Compile Include="MainPageModule.cs" />
     <Compile Include="PMS\IUiRecipeManager.cs" />
     <Compile Include="PMS\UiRecipeManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Role\Menus.cs" />
     <Compile Include="RTData.cs" />
     <Compile Include="Sequence\EventToCommand.cs" />
     <Compile Include="Sequence\FileNode.cs" />
@@ -169,40 +162,63 @@
     <Compile Include="Unity\WaferStatusHandler.cs" />
     <Compile Include="Unity\WaferStatusImp.cs" />
     <Compile Include="ViewModels\ButterflyValveViewModel.cs" />
+    <Compile Include="ViewModels\CleanRecipeViewModel.cs" />
     <Compile Include="ViewModels\DataHistoryViewModel.cs" />
+    <Compile Include="ViewModels\DETMOperationViewModel.cs" />
     <Compile Include="ViewModels\EfemViewModel.cs" />
     <Compile Include="ViewModels\EventViewModel.cs" />
-    <Compile Include="ViewModels\FaViewModel.cs" />
+    <Compile Include="ViewModels\FAViewModel.cs" />
+    <Compile Include="ViewModels\KeplerGasLeakCheckViewModel.cs" />
     <Compile Include="ViewModels\GasLeakCheckViewModel.cs" />
     <Compile Include="ViewModels\IOViewModel.cs" />
     <Compile Include="ViewModels\MFCVerificationViewModel.cs" />
     <Compile Include="ViewModels\OperationOverViewModel.cs" />
+    <Compile Include="ViewModels\OverKepler2200BViewModel.cs" />
     <Compile Include="ViewModels\OverKepler2200AViewModel.cs" />
     <Compile Include="ViewModels\OverKepler2300ViewModel.cs" />
+    <Compile Include="ViewModels\OverVenusDEViewModel.cs" />
+    <Compile Include="ViewModels\OverVenusSEViewModel.cs" />
     <Compile Include="ViewModels\OverVenusViewModel.cs" />
     <Compile Include="ViewModels\PartialPressureViewModel.cs" />
     <Compile Include="ViewModels\PlatformViewModel.cs" />
     <Compile Include="ViewModels\ProcessHistoryViewModel.cs" />
     <Compile Include="ViewModels\ProcessViewModel.cs" />
     <Compile Include="ViewModels\RecipeSequenceSelectViewModel.cs" />
+    <Compile Include="ViewModels\NewRecipeViewModel.cs" />
     <Compile Include="ViewModels\RecipeViewModel.cs" />
     <Compile Include="ViewModels\RFCalibrationViewModel.cs" />
     <Compile Include="ViewModels\RoleViewModel.cs" />
     <Compile Include="ViewModels\SequenceViewModel.cs" />
+    <Compile Include="ViewModels\SETMOperationViewModel.cs" />
+    <Compile Include="ViewModels\SeTMViewModel.cs" />
+    <Compile Include="ViewModels\SignalTowerConfigViewModel.cs" />
+    <Compile Include="ViewModels\StatisticsViewModel.cs" />
     <Compile Include="ViewModels\SystemConfigViewModel.cs" />
     <Compile Include="ViewModels\TMOperationViewModel.cs" />
     <Compile Include="ViewModels\TMViewModel.cs" />
     <Compile Include="ViewModels\TopViewModel.cs" />
+    <Compile Include="ViewModels\UserViewModel.cs" />
     <Compile Include="ViewModels\VATPerformanceViewModel.cs" />
+    <Compile Include="ViewModels\VceViewModel.cs" />
+    <Compile Include="ViewModels\VenusDeOperationOverViewModel.cs" />
+    <Compile Include="ViewModels\VenusDETMViewModel.cs" />
+    <Compile Include="ViewModels\VenusMFCVerificationViewModel.cs" />
+    <Compile Include="ViewModels\VenusSeOperationOverViewModel.cs" />
     <Compile Include="ViewModels\WaferDialogViewModel.cs" />
     <Compile Include="ViewModels\WaferHistoryDBViewModel.cs" />
     <Compile Include="ViewModels\WaferOffsetViewModel.cs" />
     <Compile Include="Views\ButterflyValveView.xaml.cs">
       <DependentUpon>ButterflyValveView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\CleanRecipeView.xaml.cs">
+      <DependentUpon>CleanRecipeView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DataHistoryView.xaml.cs">
       <DependentUpon>DataHistoryView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DETMOperationView.xaml.cs">
+      <DependentUpon>DETMOperationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\EfemView.xaml.cs">
       <DependentUpon>EfemView.xaml</DependentUpon>
     </Compile>
@@ -212,6 +228,12 @@
     <Compile Include="Views\EventView.xaml.cs">
       <DependentUpon>EventView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\FAView.xaml.cs">
+      <DependentUpon>FAView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\KeplerGasLeakCheckView.xaml.cs">
+      <DependentUpon>KeplerGasLeakCheckView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\GasLeakCheckView.xaml.cs">
       <DependentUpon>GasLeakCheckView.xaml</DependentUpon>
     </Compile>
@@ -224,18 +246,33 @@
     <Compile Include="Views\IOView.xaml.cs">
       <DependentUpon>IOView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\LogoutView.xaml.cs">
+      <DependentUpon>LogoutView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\LoginView.xaml.cs">
+      <DependentUpon>LoginView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MFCVerificationView.xaml.cs">
       <DependentUpon>MFCVerificationView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\OperationOverView.xaml.cs">
       <DependentUpon>OperationOverView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\OverKepler2200BView.xaml.cs">
+      <DependentUpon>OverKepler2200BView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\OverKepler2200AView.xaml.cs">
       <DependentUpon>OverKepler2200AView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\OverKepler2300View.xaml.cs">
       <DependentUpon>OverKepler2300View.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\OverVenusDEView.xaml.cs">
+      <DependentUpon>OverVenusDEView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OverVenusSEView.xaml.cs">
+      <DependentUpon>OverVenusSEView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\OverVenusView.xaml.cs">
       <DependentUpon>OverVenusView.xaml</DependentUpon>
     </Compile>
@@ -254,6 +291,9 @@
     <Compile Include="Views\RecipeSequenceSelectView.xaml.cs">
       <DependentUpon>RecipeSequenceSelectView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\NewRecipeView.xaml.cs">
+      <DependentUpon>NewRecipeView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RecipeView.xaml.cs">
       <DependentUpon>RecipeView.xaml</DependentUpon>
     </Compile>
@@ -266,6 +306,18 @@
     <Compile Include="Views\SequenceView.xaml.cs">
       <DependentUpon>SequenceView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SETMOperationView.xaml.cs">
+      <DependentUpon>SETMOperationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SeTMView.xaml.cs">
+      <DependentUpon>SeTMView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SignalTowerConfigView.xaml.cs">
+      <DependentUpon>SignalTowerConfigView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\StatisticsView.xaml.cs">
+      <DependentUpon>StatisticsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SystemConfigView.xaml.cs">
       <DependentUpon>SystemConfigView.xaml</DependentUpon>
     </Compile>
@@ -278,15 +330,36 @@
     <Compile Include="Views\TopView.xaml.cs">
       <DependentUpon>TopView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\FaView.xaml.cs">
-      <DependentUpon>FaView.xaml</DependentUpon>
+    <Compile Include="Views\UserView.xaml.cs">
+      <DependentUpon>UserView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\VATPerformanceView.xaml.cs">
       <DependentUpon>VATPerformanceView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\VceView.xaml.cs">
+      <DependentUpon>VceView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\VenusDeOperationOverView.xaml.cs">
+      <DependentUpon>VenusDeOperationOverView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\VenusDETMView.xaml.cs">
+      <DependentUpon>VenusDETMView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\VenusGasLeakCheckView.xaml.cs">
+      <DependentUpon>VenusGasLeakCheckView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\VenusMFCVerificationView.xaml.cs">
+      <DependentUpon>VenusMFCVerificationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\VenusSeOperationOverView.xaml.cs">
       <DependentUpon>VenusSeOperationOverView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\WaferAssociationSEUnit.xaml.cs">
+      <DependentUpon>WaferAssociationSEUnit.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NewWaferAssociationUnit.xaml.cs">
+      <DependentUpon>NewWaferAssociationUnit.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\WaferAssociationUnit.xaml.cs">
       <DependentUpon>WaferAssociationUnit.xaml</DependentUpon>
     </Compile>
@@ -301,10 +374,22 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Framework\ClientBase\OpenSEMI.ClientBase.csproj">
+      <Project>{38ba4f71-e9c5-4266-9b72-1733cdb39311}</Project>
+      <Name>OpenSEMI.ClientBase</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Framework\Common\Common.csproj">
       <Project>{9cd2a6be-1971-4e74-b49e-547982f64034}</Project>
       <Name>Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Framework\OpenControl\OpenSEMI.Ctrlib.csproj">
+      <Project>{b55e8d4b-c4c8-4a6d-9fc4-609c52a56cac}</Project>
+      <Name>OpenSEMI.Ctrlib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Framework\OpenSEMICore\OpenSEMI.Core.csproj">
+      <Project>{c4cd3d7b-cb40-47d5-ab04-df05007e5b6a}</Project>
+      <Name>OpenSEMI.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Framework\SequenceControl\SequenceControl.csproj">
       <Project>{a40b734c-f2ec-453c-a5fb-70cd46452bf1}</Project>
       <Name>SequenceControl</Name>
@@ -327,10 +412,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\CleanRecipeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\DataHistoryView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\DETMOperationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\EfemView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -343,6 +436,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\FAView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\KeplerGasLeakCheckView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\GasLeakCheckView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -359,6 +460,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\LogoutView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\LoginView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MFCVerificationView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -367,6 +476,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\OverKepler2200BView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\OverKepler2200AView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -375,6 +488,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\OverVenusDEView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\OverVenusSEView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\OverVenusView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -399,6 +520,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\NewRecipeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\RecipeView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -415,6 +540,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SETMOperationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SeTMView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SignalTowerConfigView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\StatisticsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\SystemConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -431,7 +572,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\FaView.xaml">
+    <Page Include="Views\UserView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -439,10 +580,38 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\VceView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\VenusDeOperationOverView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\VenusDETMView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\VenusGasLeakCheckView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\VenusMFCVerificationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\VenusSeOperationOverView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\WaferAssociationSEUnit.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NewWaferAssociationUnit.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\WaferAssociationUnit.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Venus/Venus_MainPages/ViewModels/StatisticsViewModel.cs

@@ -389,19 +389,21 @@ namespace Venus_MainPages.ViewModels
                             item.LastPMTime = ((DateTime)dbDataRFPump.Rows[i]["last_pm_time"]).ToString("yyyy-MM-dd HH:mm:ss.fff");
 
 
-                        if (item.Description.Contains("Follow => "))
-                        {
-                            string findmodule = item.Description.Replace("Follow => ", "");
-                            for (int j = 0; j < dbDataRFPump.Rows.Count; j++)
-                            {
-                                if (dbDataRFPump.Rows[j]["name"].ToString() == findmodule)
-                                {
-                                    item.fromLastPM = dbDataRFPump.Rows[j]["from_last_pm"].ToString();
-                                    item.Total = dbDataRFPump.Rows[j]["total"].ToString();
-                                    item.LastPMTime = ((DateTime)dbDataRFPump.Rows[j]["last_pm_time"]).ToString("yyyy-MM-dd HH:mm:ss.fff");
-                                }
-                            }
-                        }
+                        //if (item.Description.Contains("Follow => "))
+                        //{
+                        //    string findmodule = item.Description.Replace("Follow => ", "");
+                        //    for (int j = 0; j < dbDataRFPump.Rows.Count; j++)
+                        //    {
+                        //        if (dbDataRFPump.Rows[j]["name"].ToString() == findmodule)
+                        //        {
+                        //            item.fromLastPM = ((float)dbDataRFPump.Rows[j]["from_last_pm"]
+                        //            + (float)dbDataRFPump.Rows[i]["from_last_pm"]).ToString();
+                        //            item.Total = ((float)dbDataRFPump.Rows[j]["total"]
+                        //            + (float)dbDataRFPump.Rows[i]["total"]).ToString();
+                        //            item.LastPMTime = ((DateTime)dbDataRFPump.Rows[i]["last_pm_time"]).ToString("yyyy-MM-dd HH:mm:ss.fff");
+                        //        }
+                        //    }
+                        //}
                         //item.InvokePropertyChanged(nameof(item.Name));
                         //item.InvokePropertyChanged(nameof(item.AlarmEnable));
                         //item.InvokePropertyChanged(nameof(item.Description));
@@ -485,45 +487,52 @@ namespace Venus_MainPages.ViewModels
         public void ResetRFTotal(StatsDataListItemRFAndPump item)
         {
 
+            //foreach (var rfpumpitem in StatDataRFAndPump.ToList().FindAll(x => x.Description == "Follow => " + item.Name))
+            //{
+            //    InvokeClient.Instance.Service.DoOperation("System.Stats.IncreaseValue",
+            //        rfpumpitem.Name, rfpumpitem.Description, item.fromLastPM, item.Total);
+            //}
+
+            InvokeClient.Instance.Service.DoOperation("System.Stats.RFResetTotal", item.Name);
             if (item.Name.Contains(".BiasRfOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.Stats.RFResetTotal", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
                 //ResetPumpStats
             }
 
             if (item.Name.Contains(".RfOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.Stats.RFResetTotal", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
             }
 
             if (item.Name.Contains(".PumpOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.Stats.RFResetTotal", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
             }
         }
 
         public void ResetTimeValue(StatsDataListItemRFAndPump item)
         {
+            //foreach (var rfpumpitem in StatDataRFAndPump.ToList().FindAll(x => x.Description == "Follow => " + item.Name))
+            //{
+            //    InvokeClient.Instance.Service.DoOperation("System.Stats.IncreaseValue",
+            //        rfpumpitem.Name, rfpumpitem.Description, rfpumpitem.fromLastPM, rfpumpitem.Total);
+            //}
+            InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.ResetValue", item.Name);
             if (item.Name.Contains(".BiasRfOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.ResetValue", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
                 //ResetPumpStats
             }
 
             if (item.Name.Contains(".RfOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.ResetValue", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
             }
 
             if (item.Name.Contains(".PumpOnTime"))
             {
-                InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.ResetValue", item.Name);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
             }
 
             //InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.ResetValue", item.Name);
@@ -547,20 +556,20 @@ namespace Venus_MainPages.ViewModels
             if (item.Name.Contains(".PumpOnTime"))
             {
                 InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.SetPMIntervalValue", item.Name, setValue);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.MainPump.ResetPumpStats", item.Name);
             }
 
             if (item.Name.Contains(".BiasRfOnTime"))
             {
                 InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.SetPMIntervalValue", item.Name, setValue);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.BiasRf.ResetRFStats", item.Name);
                 //ResetPumpStats
             }
 
             if (item.Name.Contains(".RfOnTime"))
             {
                 InvokeClient.Instance.Service.DoOperation("System.StatsRFAndPump.SetPMIntervalValue", item.Name, setValue);
-                InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
+                //InvokeClient.Instance.Service.DoOperation($"{item.Name.Split('.')[0]}.Rf.ResetRFStats", item.Name);
             }
 
             item.PMIntervalTextSaved = true;

Venus/Venus_RT/Devices/AdTecRF.cs

@@ -325,8 +325,8 @@ namespace Venus_RT.Devices
 
             if (_rfOnTrigger.M)
             {
-                TotalDays = _total + _timerTotal.GetElapseTime() / 1000 / 60 / 60;
-                DaysFromLastPM = _fromLast + _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
+                TotalDays = _timerTotal.GetElapseTime() / 1000 / 60 / 60;
+                DaysFromLastPM = _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
             }
 
             if (PMIntervalDays > 0)

Venus/Venus_RT/Devices/CometRF.cs

@@ -838,8 +838,8 @@ namespace Venus_RT.Devices
 
             if (_rfOnTrigger.M)
             {
-                TotalDays = _total + _timerTotal.GetElapseTime() / 1000 / 60 / 60;
-                DaysFromLastPM = _fromLast + _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
+                TotalDays = _timerTotal.GetElapseTime() / 1000 / 60 / 60;
+                DaysFromLastPM = _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
 
                 _checkerPower.Monitor(ForwardPower, PowerSetPoint - _scPowerAlarmRange.DoubleValue, PowerSetPoint + _scPowerAlarmRange.DoubleValue, _scPowerAlarmTime.DoubleValue);
 

Venus/Venus_RT/Devices/EdwardsPump.cs

@@ -405,8 +405,8 @@ namespace Venus_RT.Devices
                 //如果开着，就更新SC
                 if (_trigOnOff.M)
                 {
-                    TotalDays = _total + _timerTotal.GetElapseTime() / 1000 / 60 / 60;
-                    DaysFromLastPM = _fromLast + _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
+                    TotalDays = _timerTotal.GetElapseTime() / 1000 / 60 / 60;
+                    DaysFromLastPM = _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
                 }
 
                 if (PMIntervalDays > 0)

Venus/Venus_RT/Devices/SkyPump.cs

@@ -746,8 +746,8 @@ namespace Venus_RT.Devices
                 //如果开着，就更新SC
                 if (_trigOnOff.M)
                 {
-                    TotalDays = _total + _timerTotal.GetElapseTime() / 1000 / 60 / 60;
-                    DaysFromLastPM = _fromLast + _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
+                    TotalDays = _timerTotal.GetElapseTime() / 1000 / 60 / 60;
+                    DaysFromLastPM = _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
                 }
 
                 if (PMIntervalDays > 0)

Venus/Venus_RT/Devices/TruPlasmaRF.cs

@@ -331,8 +331,8 @@ namespace Venus_RT.Devices
 
             if (_rfOnTrigger.M)
             {
-                TotalDays = _total + _timerTotal.GetElapseTime() / 1000 / 60 / 60;
-                DaysFromLastPM = _fromLast + _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
+                TotalDays = _timerTotal.GetElapseTime() / 1000 / 60 / 60;
+                DaysFromLastPM = _timerFromLast.GetElapseTime() / 1000 / 60 / 60;
             }
 
             if (PMIntervalDays > 0)

Venus/Venus_RT/Modules/ResourceMonitor.cs

@@ -20,6 +20,7 @@ namespace Venus_RT.Modules
     {
         private string processRTname = Process.GetCurrentProcess().ProcessName;
         private string processUIname = "Venus_UI";
+        private string processSimuname = "Venus_Simulator";
         //private int _stringlen = 20;
         private int threshold = 800;
         private Process pro;
@@ -145,6 +146,7 @@ namespace Venus_RT.Modules
             {
                 string rtmonoitor = process_use(processRTname);
                 string uimonoitor = process_use(processUIname); 
+                string simumonoitor = process_use(processSimuname); 
 
                 string systemMonitor = $"PC => {drive_use()}" +
                     $"{cpu_use()}" +
@@ -153,7 +155,8 @@ namespace Venus_RT.Modules
                 LOG.Write(eEvent.INFO_WINRESOURCE, ModuleName.System,
                     rtmonoitor +
                     " ".PadLeft(56, ' ') + uimonoitor +
-                    " ".PadLeft(56, ' ') + systemMonitor
+                    " ".PadLeft(56, ' ') + simumonoitor +
+                    " ".PadLeft(56, ' ') + systemMonitor 
                 );
                 //没有就不做任何操作