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

View/QueryView.xaml.cs

@@ -81,11 +81,11 @@ namespace Audit.View
             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列选中行单元格，机台
-            string DataGridCreationTime_value = (DataGridDyelots.Columns[3].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，机台
-            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取单元格变量填入工单输入框
-            Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取单元格变量填入重染框
-            Dyelots_Machine.Text = DataGridMachine_value.ToString();//获取单元格变量填入机台输入框
-            Dyelots_CreationTime.Text = DataGridCreationTime_value.ToString();
+            string DataGridCreationTime_value = (DataGridDyelots.Columns[3].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，开单时间
+            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取工单单元格字符串填入工单输入框
+            Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取重染单元格字符串填入重染框
+            Dyelots_Machine.Text = DataGridMachine_value.ToString();//获取机台单元格字符串填入机台输入框
+            Dyelots_CreationTime.Text = DataGridCreationTime_value.ToString();//获取开单时间单元格字符串填入开单时间框
             if (string.IsNullOrWhiteSpace(DataGridDyelots_value)) 
             {  } 
             else