1.Slove TuroN2Flow don't show problem

2.Fix value heater view crashing problem

Venus/Venus_MainPages/ViewModels/ButterflyValveViewModel.cs

@@ -15,7 +15,7 @@ namespace Venus_MainPages.ViewModels
     public class ButterflyValveViewModel : BindableBase
     {
         #region 私有字段
-        private string ModuleName = "PMA";
+        public string ModuleName = "PMA";
         private string m_DeviceName = "PendulumValve";
         private bool m_IsPositionMode;
         private int m_SetValue;

Venus/Venus_MainPages/ViewModels/OverKepler2200AViewModel.cs

@@ -19,6 +19,7 @@ using Venus_Unity;
 using MECF.Framework.Common.CommonData.DeviceData;
 using System.Windows.Shapes;
 using Path = System.IO.Path;
+using MECF.Framework.Common.Equipment;
 
 namespace Venus_MainPages.ViewModels
 {
@@ -1300,7 +1301,7 @@ namespace Venus_MainPages.ViewModels
             //if (butterflyValveMessageBox == null)
             //{
                 var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
-                butterflyValveMessageBox = new ButterflyValveView();
+                butterflyValveMessageBox = new ButterflyValveView(ModuleName.ToString());
                 butterflyValveMessageBox.WindowStartupLocation = WindowStartupLocation.Manual;
                 butterflyValveMessageBox.Left = 700;
                 butterflyValveMessageBox.Top = 600;

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -211,6 +211,7 @@ namespace Venus_MainPages.ViewModels
         private RecipeStep m_CurrentRecipeStep = new RecipeStep();
 
         private double m_ChamberPressureFeedBack;
+        private double m_TurboN2FlowSetPoint;
 
 
         #endregion
@@ -530,6 +531,18 @@ namespace Venus_MainPages.ViewModels
             get { return m_N2SetPoint; }
             set { SetProperty(ref m_N2SetPoint, value); }
         }
+        public double TurboN2FlowSetPoint
+        {
+            get { return m_TurboN2FlowSetPoint; }
+            set
+            {
+                if (value != m_TurboN2FlowSetPoint)
+                {
+                    InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcN2.SetPoint", value);
+                }
+                SetProperty(ref m_TurboN2FlowSetPoint, value);
+            }
+        }
         public AITMfcData MFC1Data
         {
             get { return m_MFC1Data; }
@@ -1366,7 +1379,7 @@ namespace Venus_MainPages.ViewModels
             //if (butterflyValveMessageBox == null)
             //{
             var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
-            butterflyValveMessageBox = new ButterflyValveView();
+            butterflyValveMessageBox = new ButterflyValveView(ModuleName.ToString());
             butterflyValveMessageBox.WindowStartupLocation = WindowStartupLocation.Manual;
             butterflyValveMessageBox.Left = 700;
             butterflyValveMessageBox.Top = 600;
@@ -1537,8 +1550,7 @@ namespace Venus_MainPages.ViewModels
                 return;
             }
 
-            var N2SetPoint = Convert.ToInt32(QueryDataClient.Instance.Service.GetConfig("System.TurboN2FlowSetPoint"));
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcN2.SetPoint", N2SetPoint);
+            TurboN2FlowSetPoint = Convert.ToInt32(QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.TurboN2FlowSetPoint"));
 
             PVN21ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVN21.IsOpen");
             GasFinalValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveGasFinal.IsOpen");

Venus/Venus_MainPages/ViewModels/OverVenusViewModel.cs

@@ -1323,7 +1323,7 @@ namespace Venus_MainPages.ViewModels
             //if (butterflyValveMessageBox == null)
             //{
                 var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
-                butterflyValveMessageBox = new ButterflyValveView();
+                butterflyValveMessageBox = new ButterflyValveView(ModuleName.ToString());
                 butterflyValveMessageBox.WindowStartupLocation = WindowStartupLocation.Manual;
                 butterflyValveMessageBox.Left = 700;
                 butterflyValveMessageBox.Top = 600;

Venus/Venus_MainPages/Views/ButterflyValveView.xaml

@@ -8,7 +8,7 @@
              xmlns:prism="http://prismlibrary.com/"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d" 
-             Width="300" Height="300" WindowStyle="None" ResizeMode="CanMinimize" BorderThickness="1" MouseLeftButtonDown="Window_MouseLeftButtonDown" Background="#B1D2F2">
+             Width="300" Height="300" WindowStyle="None" ResizeMode="CanMinimize" BorderThickness="1" MouseLeftButtonDown="Window_MouseLeftButtonDown" Background="#B1D2F2" Loaded="Window_Loaded">
     <Window.Resources>
         <converters:BoolToValueConverter x:Key="BoolToValueConverter"/>
         <converters:BoolToBool x:Key="BoolToBool"/>

Venus/Venus_MainPages/Views/ButterflyValveView.xaml.cs

@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Venus_MainPages.ViewModels;
 
 namespace Venus_MainPages.Views
 {
@@ -20,11 +21,17 @@ namespace Venus_MainPages.Views
     /// </summary>
     public partial class ButterflyValveView : Window
     {
+        private string mymoduleName;
         public ButterflyValveView()
         {
             InitializeComponent();
         }
-
+        public ButterflyValveView(string moduleName)
+        {
+            mymoduleName = moduleName;
+           
+            InitializeComponent();
+        }
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             this.Close();
@@ -34,5 +41,10 @@ namespace Venus_MainPages.Views
         {
             this.DragMove();
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            (this.DataContext as ButterflyValveViewModel).ModuleName = mymoduleName;
+        }
     }
 }

Venus/Venus_RT/Modules/PMs/PMProcess_FA.cs

@@ -208,7 +208,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.StationName, module},
                     {DVIDName.SlotID, (wafer.OriginSlot + 1).ToString()},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    //{DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
                 });
             }
         }

Venus/Venus_Simulator/Devices/EdwardsPumpMockPMA.cs

@@ -18,7 +18,7 @@ namespace Venus_Simulator.Devices
         public static SimEdwardsPumpStatus _simPumpControlStatus;
         private const string EOF = "\r\n";
         private const char MSG_DELIMITER = ' ';
-        private const string MOCKUP_PORT = "COM83";
+        private const string MOCKUP_PORT = "COM";
 
         public EdwardsPumpMockPMA() : base(MOCKUP_PORT, -1, EOF, MSG_DELIMITER)
         {

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -141,7 +141,7 @@ namespace Venus_Simulator.Instances
                     //// pressure
                     SetAiValue($"{mod}.AI_Foreline_Pressure_760t", 5001);
                     //SetAiValue($"{mod}.AI_Chamber_Pressure_10t", 5000);
-                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 1000);
+                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 100);
                     //SetAiValue($"{mod}.AI_Chamber_Pressure_10t", ATM_PRESSURE);
                     SetAiValue($"{mod}.AI_Chamber_Pressure_Virtual", PROCESS_GAUGE);
 
@@ -240,7 +240,7 @@ namespace Venus_Simulator.Instances
                     //// pressure
                     SetAiValue($"{mod}.AI_Foreline_Pressure_10t", 5001);
                     //SetAiValue($"{mod}.AI_Chamber_Pressure_10t", 5000);
-                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 1000);
+                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 100);
                     //SetAiValue($"{mod}.AI_Chamber_Pressure_760t", ATM_PRESSURE);
                     SetAiValue($"{mod}.AI_Chamber_Pressure_Virtual", PROCESS_GAUGE);
 
@@ -330,7 +330,7 @@ namespace Venus_Simulator.Instances
                     //// pressure
                     SetAiValue($"{mod}.AI_Foreline_Pressure_10t", 5001);
                     //SetAiValue($"{mod}.AI_Chamber_Pressure_10t", 5000);
-                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 1000);
+                    SetAiValue($"{mod}.AI_Process_Pressure_100mt", 100);
                     SetAiValue($"{mod}.AI_Chamber_Pressure_Virtual", PROCESS_GAUGE);
 
                     //// Temperature

Venus/Venus_Simulator/Views/SimuSMCChillerGridPMCView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerGridViewModelPMC() : base("SkyPumpPMCSimulator")
         {
-            Init(new SMCChillerMock("COM57"));
+            Init(new SMCChillerMock("COM"));
         }
     }
 }

Venus/Venus_Simulator/Views/SimuSMCChillerGridPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerGridViewModelPMD() : base("SkyPumpPMDSimulator")
         {
-            Init(new SMCChillerMock("COM57"));
+            Init(new SMCChillerMock("COM"));
         }
     }
 }