Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

View/QueryView.xaml.cs

@@ -78,11 +78,17 @@ namespace Audit.View
         private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件
         {
             int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量
-            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格
+            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，单号
+            string DataGridReDye_value = (DataGridDyelots.Columns[1].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，重染
+            string DataGridMachine_value = (DataGridDyelots.Columns[2].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，机台
             Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取单元格变量填入工单输入框
-            if (DataGridDyelots_value != null) 
+            Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取单元格变量填入重染框
+            Dyelots_Machine.Text = DataGridMachine_value.ToString();//获取单元格变量填入机台输入框
+            if (string.IsNullOrWhiteSpace(DataGridDyelots_value)) 
+            {  } 
+            else 
             {
-
+                
             }
         }
     }