hecl преди 1 година
родител
ревизия
78c80a0896

+ 2 - 0
Venus/Venus_MainPages/ViewModels/ProcessHistoryViewModel.cs

@@ -605,9 +605,11 @@ namespace Venus_MainPages.ViewModels
         }
         private void OnClearData()
         {
+            this.view.MyDrawGraphicsControl.YPoints.Clear();
             PdKeyDataCollection.Clear();
             this.view.MyDrawGraphicsControl.ClearPlotPoints();
             CloseAll(ParameterNodes);
+           
         }
     }
         #endregion

+ 4 - 4
Venus/Venus_MainPages/ViewModels/WaferHistoryDBViewModel.cs

@@ -118,11 +118,11 @@ namespace Venus_MainPages.ViewModels
                 WaferHistoryWafer wafer1 = new WaferHistoryWafer();
                 wafer1.StartTime = WaferRecipe.StartTime;
                 wafer1.EndTime = WaferRecipe.EndTime;
-                string sql = string.Format($"SELECT * FROM \"lot_wafer_data\" where  wafer_data_guid ='{WaferRecipe.ID}'; ");
+                string sql = string.Format($"SELECT * FROM \"lot_wafer_data\" where  wafer_data_guid ='{WaferRecipe.RfID}'; ");
                 DataTable dbData = QueryDataClient.Instance.Service.QueryData(sql);
                 string lot_data_guid = dbData.Rows[0]["guid"].ToString();
                 wafer1.WaferGuid = lot_data_guid;
-                SwitchPage( "ProcessHistory", wafer1);
+                SwitchPage("Process History", wafer1);
             }
             else if (o is WaferHistoryLot waferLot)
             {
@@ -147,7 +147,7 @@ namespace Venus_MainPages.ViewModels
             }
             else if (o is WaferHistoryWafer wafer) 
             {
-                SwitchPage("ProcessHistory", item1);
+                SwitchPage("Process History", item1);
             }
             
         }
@@ -487,7 +487,7 @@ namespace Venus_MainPages.ViewModels
                 for (int i = 0; i < dbData.Rows.Count; i++)
                 {
                     WaferHistoryRecipe item = new WaferHistoryRecipe();
-
+                    item.RfID = dbData.Rows[i]["wafer_data_guid"].ToString();
                     item.ID = dbData.Rows[i]["guid"].ToString();
                     var itemName = dbData.Rows[i]["recipe_name"].ToString();
 

+ 13 - 10
Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -225,29 +225,32 @@ namespace Venus_UI.Views
             ModuleManager.Initialize();
 
         }
-         
+
         public void Anystationchange(string menuviewItem, WaferHistoryWafer queryFilter)
         {
-            UserControl address = new ProcessHistoryView();          
-            ProcessHistoryViewModel vm = new ProcessHistoryViewModel() {};
+            UserControl address = new ProcessHistoryView();
+            ProcessHistoryViewModel vm = new ProcessHistoryViewModel() { };
             vm.searchlot(queryFilter.WaferGuid);
             //vm.OnDataGridSelectionChanged(vm.Recipes[0]);
             address.DataContext = vm;
             int s = 0;
-            for(int i = 0; i < centerTabViews.Count; i++)
+            for (int i = 0; i < centerTabViews.Count; i++)
             {
                 var item = centerTabViews[i];
-                foreach(TabItem v in item.Items) 
-                { 
-                    if (v.Header.ToString()== "Process History")
+                foreach (TabItem v in item.Items)
+                {
+                    if (v.Header.ToString() == "Process History")
                     {
                         s = i;
                     }
                 }
             }
-            centerTabViews[s].Items[2]= new TabItem() { Header = menuviewItem, Content = address };
-            centerTabViews[s].SelectedIndex = 2;
-            Main_Frame.Content = centerTabViews[s];
+            if (s != 0)
+            {
+                centerTabViews[s].Items[2] = new TabItem() { Header = menuviewItem, Content = address };
+                centerTabViews[s].SelectedIndex = 2;
+                Main_Frame.Content = centerTabViews[s];
+            }
         }
         private void AduRadioButtonIcon_Click(object sender, RoutedEventArgs e)
         {