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

View/QueryView.xaml

@@ -45,6 +45,7 @@
                     <DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}"/>
                     <DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}"/>
                     <DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
+                    <DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0"/>
                 </DataGrid.Columns>
             </DataGrid>
             <DataGrid ItemsSource="{Binding DyelotsBulkedRecipe}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40">
@@ -79,7 +80,7 @@
                     <DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}"/>
                     <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}"/>
                     <DataGridTextColumn Header="偏差" Width="70" FontSize="15"/>
-                    <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime}"/>
+                    <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"/>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBox x:Name="Dyelots_Dyelot"   HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" Text="" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1" MaxLength="25"/>

View/QueryView.xaml.cs

@@ -81,9 +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();
             if (string.IsNullOrWhiteSpace(DataGridDyelots_value)) 
             {  } 
             else