Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/QueryView.xaml.cs

@@ -30,7 +30,16 @@ namespace Audit.View
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
+            string DataGridDyelots_Button = this.Dyelots_Dyelot.Text;
+            string DataGridMachine_Button = this.Dyelots_Machine.Text;
+            if ((DataGridDyelots_Button == null) && (DataGridMachine_Button != null))
+            {
                 
+            }
+            if ((DataGridDyelots_Button != null) && (DataGridMachine_Button == null))
+            {
+                
+            }
         }
 
         private void DataGrid_Detailed(object sender, SelectionChangedEventArgs e)
@@ -46,7 +55,11 @@ namespace Audit.View
         {
             int rownum = this.DataGridDyelots.SelectedIndex;
             string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;
-            MessageBox.Show(DataGridDyelots_value.ToString());
+            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();
+            if (Dyelots_Dyelot != null) 
+            {
+
+            }
         }
     }
 }