git-svn-id: http://10.4.3.168:50001/svn/Furnace@40 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Branch/NTP02/Furnace/FurnaceGasPanelUI/Config/Menu.xml

@@ -4,5 +4,6 @@
 		<menuItem type="NTP" id="GasPanel" resKey="GasPanel" viewmodel="FurnaceGasPanelUI.Views.Maintenances.NTP.GasPanelViewModel,FurnaceGasPanelUI" /> 
 		<menuItem type="ELK" id="GasPanel" resKey="GasPanel" viewmodel="FurnaceGasPanelUI.Views.Maintenances.ELK.GasPanelViewModel,FurnaceGasPanelUI" />
 		<menuItem type="SiBCN" id="GasPanel" resKey="GasPanel" viewmodel="FurnaceGasPanelUI.Views.Maintenances.SiBCN.GasPanelViewModel,FurnaceGasPanelUI" />
+    <menuItem type="NTP02" id="GasPanel" resKey="GasPanel" viewmodel="FurnaceGasPanelUI.Views.Maintenances.NTP02.GasPanelViewModel,FurnaceGasPanelUI" />
 	</menuItem>
 </menu>

Branch/NTP02/Furnace/FurnaceGasPanelUI/FurnaceGasPanelUI.csproj

@@ -159,6 +159,10 @@
     </Compile>
     <Compile Include="Views\EmptyViewModel.cs" />
     <Compile Include="Views\LocalUIViewModelBase.cs" />
+    <Compile Include="Views\Maintenances\NTP02\GasPanelView.xaml.cs">
+      <DependentUpon>GasPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Maintenances\NTP02\GasPanelViewModel.cs" />
     <Compile Include="Views\Maintenances\TiN\GasPanelView.xaml.cs">
       <DependentUpon>GasPanelView.xaml</DependentUpon>
     </Compile>
@@ -187,6 +191,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\Maintenances\NTP02\GasPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Maintenances\TiN\GasPanelView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Branch/NTP02/Furnace/FurnaceGasPanelUI/Views/Maintenances/NTP02/GasPanelView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace FurnaceGasPanelUI.Views.Maintenances.NTP02
+{
+    /// <summary>
+    /// GasPanelView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GasPanelView : UserControl
+    {
+        public GasPanelView()
+        {
+            InitializeComponent();
+        }
+    }
+}

Branch/NTP02/Furnace/FurnaceUI/FurnaceUI.csproj

@@ -297,6 +297,10 @@
       <DependentUpon>AlarmErrorJumpStepView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Editors\AlarmErrorJumpStepViewModel.cs" />
+    <Compile Include="Views\Editors\NTP02\RecipeGasPanelSettingView.xaml.cs">
+      <DependentUpon>RecipeGasPanelSettingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Editors\NTP02\RecipeGasPanelSettingViewModel.cs" />
     <Compile Include="Views\Editors\TiN\RecipeGasPanelSettingView.xaml.cs">
       <DependentUpon>RecipeGasPanelSettingView.xaml</DependentUpon>
     </Compile>
@@ -639,6 +643,10 @@
       <DependentUpon>IOListView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Maintenances\IOListViewModel.cs" />
+    <Compile Include="Views\Maintenances\Maintenances\NTP02\GasPanelView.xaml.cs">
+      <DependentUpon>GasPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Maintenances\Maintenances\NTP02\GasPanelViewModel.cs" />
     <Compile Include="Views\Maintenances\Maintenances\TiN\GasPanelView.xaml.cs">
       <DependentUpon>GasPanelView.xaml</DependentUpon>
     </Compile>
@@ -1223,6 +1231,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Editors\NTP02\RecipeGasPanelSettingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Editors\TiN\RecipeGasPanelSettingView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1563,6 +1575,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Maintenances\Maintenances\NTP02\GasPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Maintenances\Maintenances\TiN\GasPanelView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Branch/NTP02/Furnace/FurnaceUI/Views/Editors/NTP02/RecipeGasPanelSettingView.xaml.cs

@@ -0,0 +1,17 @@
+using System.Windows.Controls;
+
+namespace FurnaceUI.Views.Editors.NTP02
+{
+    /// <summary>
+    /// RecipeGasPanelSettingView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeGasPanelSettingView : UserControl
+    {
+        #region ctor
+        public RecipeGasPanelSettingView()
+        {
+            InitializeComponent();
+        } 
+        #endregion
+    }
+}

Branch/NTP02/Furnace/FurnaceUI/Views/Maintenances/Maintenances/NTP02/GasPanelView.xaml.cs

@@ -0,0 +1,17 @@
+using System.Windows.Controls;
+
+namespace FurnaceUI.Views.Maintenances.Maintenances.NTP02
+{
+    /// <summary>
+    /// GasPanelView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GasPanelView : UserControl
+    {
+        #region ctor
+        public GasPanelView()
+        {
+            InitializeComponent();
+        } 
+        #endregion
+    }
+}

Branch/NTP02/Furnace/FurnaceUI/Views/Operations/Maintenances/ManualSetViewModel.cs

@@ -1116,6 +1116,105 @@ namespace FurnaceUI.Views.Recipes
                     }
                 }
             }
+            else if (!string.IsNullOrEmpty(toolType) && toolType.Equals(ConstantsCommon.NTP02))
+            {
+                FurnaceUI.Views.Maintenances.Maintenances.NTP02.GasPanelViewModel gasPanelTwoView = new Maintenances.Maintenances.NTP02.GasPanelViewModel();
+                gasPanelTwoView.MFCDataList = MFCDataList;
+                var rtn = (wm as WindowManager)?.ShowDialogWithTitle(gasPanelTwoView, null, " Gas Panel");
+                if ((bool)rtn)
+                {
+                    DictValve = gasPanelTwoView.DictChangedValve;
+                    DictMFC = ChangedDictMFC(gasPanelTwoView.DictChangedMFC);
+                    foreach (var item in DictMFC)
+                    {
+                        var tempMFC = MFCDataList.FirstOrDefault(x => x.Name == item.Key);
+                        if (tempMFC != null)
+                        {
+                            tempMFC.IsSetChanged = false;
+                            tempMFC.Value = item.Value;
+                        }
+                    }
+
+                    if (DictMFC.Count == 0)
+                    {
+                        for (int i = 0; i < MFCDataList.Count; i++)
+                        {
+
+                            double setLastPoint = (double)QueryDataClient.Instance.Service.GetConfig($"PM1.MFC.{MFCDataList[i].DisplayName}.SetLastPoint");
+                            double setLastRamping = (double)QueryDataClient.Instance.Service.GetConfig($"PM1.MFC.{MFCDataList[i].DisplayName}.SetLastRamping");
+                            MFCDataList[i].Value = setLastPoint.ToString("f3");
+                            MFCDataList[i].Rampng = setLastRamping.ToString("f3");
+                            MFCDataList[i].IsSetChanged = true;
+                        };
+                    }
+                    if (gasPanelTwoView.DictChangedPumpValve.Count > 0)
+                    {
+                        PumpSetValues.Clear();
+                        if (gasPanelTwoView.AGVPumpData != null && gasPanelTwoView.AGVPumpData.DefaultValue != gasPanelTwoView.AGVPumpData.Feedback)
+                        {
+                            PumpSetValues.Add(gasPanelTwoView.AGVPumpData.UniqueName, gasPanelTwoView.AGVPumpData.Feedback);
+                            // InvokeClient.Instance.Service.DoOperation($"{gasPanelTwoView.AGVPumpData.UniqueName}.{AITValveOperation.GVTurnValve}", gasPanelTwoView.AGVPumpData.Feedback);
+                        }
+                        if (gasPanelTwoView.AUCPumpData != null && gasPanelTwoView.AUCPumpData.DefaultValue != gasPanelTwoView.AUCPumpData.Feedback)
+                        {
+                            PumpSetValues.Add(gasPanelTwoView.AUCPumpData.UniqueName, gasPanelTwoView.AUCPumpData.Feedback);
+                            //  InvokeClient.Instance.Service.DoOperation($"{gasPanelTwoView.AUCPumpData.UniqueName}.{AITValveOperation.GVTurnValve}", gasPanelTwoView.AUCPumpData.Feedback);
+                        }
+                        if (gasPanelTwoView.BothPumpData != null && gasPanelTwoView.BothPumpData.DefaultValue != gasPanelTwoView.BothPumpData.Feedback)
+                        {
+                            PumpSetValues.Add(gasPanelTwoView.BothPumpData.UniqueName, gasPanelTwoView.BothPumpData.Feedback);
+                            //  InvokeClient.Instance.Service.DoOperation($"{gasPanelTwoView.BothPumpData.UniqueName}.{AITValveOperation.GVTurnValve}", gasPanelTwoView.BothPumpData.Feedback);
+                        }
+                        if (gasPanelTwoView.ValveBWRData != null && gasPanelTwoView.ValveBWRData.DefaultValue != gasPanelTwoView.ValveBWRData.Feedback)
+                        {
+                            PumpSetValues.Add(gasPanelTwoView.ValveBWRData.UniqueName, gasPanelTwoView.ValveBWRData.Feedback);
+                            //  InvokeClient.Instance.Service.DoOperation($"{gasPanelTwoView.ValveBWRData.UniqueName}.{AITValveOperation.GVTurnValve}", gasPanelTwoView.ValveBWRData.Feedback);
+                        }
+                        if (gasPanelTwoView.ValveDPRData != null && gasPanelTwoView.ValveDPRData.DefaultValue != gasPanelTwoView.ValveDPRData.Feedback)
+                        {
+                            PumpSetValues.Add(gasPanelTwoView.ValveDPRData.UniqueName, gasPanelTwoView.ValveDPRData.Feedback);
+                            // InvokeClient.Instance.Service.DoOperation($"{gasPanelTwoView.ValveDPRData.UniqueName}.{AITValveOperation.GVTurnValve}", gasPanelTwoView.ValveDPRData.Feedback);
+                        }
+                        F2HFClnOrHFCl2Values.Clear();
+                        if (gasPanelTwoView.IsDEPOOn != gasPanelTwoView.IsOldDEPOOn)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetDEPOEnable", gasPanelTwoView.IsDEPOOn);
+                            // InvokeClient.Instance.Service.DoOperation($"PM1.SetF2ClnEnable", gasPanelTwoView.IsF2ClnOn);
+                        }
+                        if (gasPanelTwoView.IsF2ClnOn != gasPanelTwoView.IsOldF2ClnOn)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetF2ClnEnable", gasPanelTwoView.IsF2ClnOn);
+                            // InvokeClient.Instance.Service.DoOperation($"PM1.SetF2ClnEnable", gasPanelTwoView.IsF2ClnOn);
+                        }
+                        if (gasPanelTwoView.IsHFClnOn != gasPanelTwoView.IsOldHFClnOn)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetHFClnEnable", gasPanelTwoView.IsHFClnOn);
+                            //InvokeClient.Instance.Service.DoOperation($"PM1.SetHFClnEnable", gasPanelTwoView.IsHFClnOn);
+                        }
+                        if (gasPanelTwoView.IsHTR1Enable != gasPanelTwoView.IsOldHTR1Enable)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetHTR1Enable", gasPanelTwoView.IsHTR1Enable);
+                            // InvokeClient.Instance.Service.DoOperation($"PM1.SetHTR1Enable", gasPanelTwoView.IsHTR1Enable);
+                        }
+                        if (gasPanelTwoView.IsHTR2Enable != gasPanelTwoView.IsOldHTR2Enable)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetHTR2Enable", gasPanelTwoView.IsHTR2Enable);
+                            //InvokeClient.Instance.Service.DoOperation($"PM1.SetHTR2Enable", gasPanelTwoView.IsHTR2Enable);
+                        }
+                        if (gasPanelTwoView.IsHTR3Enable != gasPanelTwoView.IsOldHTR3Enable)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetHTR3Enable", gasPanelTwoView.IsHTR3Enable);
+                            //InvokeClient.Instance.Service.DoOperation($"PM1.SetHTR2Enable", gasPanelTwoView.IsHTR2Enable);
+                        }
+                        if (gasPanelTwoView.IsCEXHOn != gasPanelTwoView.IsOldCEXHOn)
+                        {
+                            F2HFClnOrHFCl2Values.Add("PM1.SetCEXHEnable", gasPanelTwoView.IsCEXHOn);
+                            //InvokeClient.Instance.Service.DoOperation($"PM1.SetHTR2Enable", gasPanelTwoView.IsHTR2Enable);
+                        }
+                    }
+                }
+            }
+
             else if (!string.IsNullOrEmpty(toolType) && toolType.Equals(ConstantsCommon.TiN))
             {
                 FurnaceUI.Views.Maintenances.Maintenances.TiN.GasPanelViewModel gasPanelTwoView = new Maintenances.Maintenances.TiN.GasPanelViewModel();
@@ -1297,8 +1396,6 @@ namespace FurnaceUI.Views.Recipes
                     }
                 }
             }
-
-
         }
 
         public void SwitchPage(string page)

Branch/NTP02/Furnace/FurnaceUI/Views/Recipes/RecipeProcessEditViewModel.cs

@@ -2201,8 +2201,24 @@ namespace FurnaceUI.Views.Recipes
                                     isEditMFC = false;
                                 }
                             }
+                        }
+                        else if (ConstantsCommon.NTP02.Equals(toolType))
+                        {
 
+                            using (FurnaceUI.Views.Editors.NTP02.RecipeGasPanelSettingViewModel recipeGasPanelSettingViewModel = new FurnaceUI.Views.Editors.NTP02.RecipeGasPanelSettingViewModel())
+                            {
+                                recipeGasPanelSettingViewModel.CurrentRecipe = CurrentRecipe;
+                                recipeGasPanelSettingViewModel.SelectedStepName = $"{SelectedRecipeStep.StepNo}:{SelectedRecipeStep.Name}";
+                                recipeGasPanelSettingViewModel.ChangedStepEvent += RecipeGasPanelSettingViewModel_ChangedStepEvent;
+                                recipeGasPanelSettingViewModel.SelectedStep = CurrentRecipe.Steps.Where(x => x.StepNo == SelectedRecipeStep.StepNo).FirstOrDefault();
+                                bool rtn = (bool)(windowManager as WindowManager)?.ShowDialogWithTitle(recipeGasPanelSettingViewModel, null, "Valve");
+                                if (rtn)
+                                {
+                                    isEditMFC = false;
+                                }
+                            }
                         }
+
                         else if (ConstantsCommon.TiN.Equals(toolType))
                         {