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

View/QueryView.xaml

@@ -73,13 +73,13 @@
                     </Style>
                 </DataGrid.CellStyle>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="步骤" Width="60" FontSize="15" Binding="{Binding StepNumber}"/>
+                    <DataGridTextColumn Header="步骤" Width="50" FontSize="15" Binding="{Binding StepNumber}"/>
                     <DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}"/>
                     <DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}"/>
                     <DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}"/>
-                    <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding Amount}"/>
+                    <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}"/>
                     <DataGridTextColumn Header="偏差" Width="70" FontSize="15"/>
-                    <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding FinishTime}"/>
+                    <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime}"/>
                 </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"/>