sc
/
Audit_APP
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
sc 4 years ago
parent
18855117a9 60dda73867
commit
ea6ff2f62a
2 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      View/QueryView.xaml
  2. 2
      ViewModel/QueryViewModel.cs

38
View/QueryView.xaml
View File

@ -15,37 +15,37 @@
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC"> <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<DataGrid HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="310" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15"> <DataGrid ItemsSource="{Binding Dyelots}" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="工单" Width="160" FontSize="25" /> <DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}"/>
<DataGridTextColumn Header="重染" Width="60" FontSize="25"/> <DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}"/>
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/> <DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<DataGrid HorizontalAlignment="Left" Margin="340,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15"> <DataGrid ItemsSource="{Binding DyelotsBulkedRecipe}" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="步骤" Width="60" FontSize="25"/> <DataGridTextColumn Header="步骤" Width="60" FontSize="15" Binding="{Binding StepNumber}"/>
<DataGridTextColumn Header="原料代码" Width="100" FontSize="25"/> <DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}"/>
<DataGridTextColumn Header="原料名称" Width="100" FontSize="25"/> <DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}"/>
<DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/> <DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}"/>
<DataGridTextColumn Header="实际用量" Width="150" FontSize="25"/> <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding Amount}"/>
<DataGridTextColumn Header="偏差" Width="70" FontSize="25"/> <DataGridTextColumn Header="偏差" Width="70" FontSize="15"/>
<DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/> <DataGridTextColumn Header="结束时间" Width="300" FontSize="15"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<TextBox HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="20"/> <TextBox HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="20"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="20"/> <TextBox HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="20"/>
<DatePicker HorizontalAlignment="Left" Height="30" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/> <DatePicker HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
<DatePicker HorizontalAlignment="Left" Height="30" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/> <DatePicker HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,50" TextWrapping="Wrap" Text="开单时间" VerticalAlignment="Bottom" Width="90" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="350,0,0,50" TextWrapping="Wrap" Text="开单时间" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,100" TextWrapping="Wrap" Text="日期范围" VerticalAlignment="Bottom" Width="90" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="350,0,0,100" TextWrapping="Wrap" Text="日期范围" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="45" Margin="645,0,0,101" TextWrapping="Wrap" Text="～" VerticalAlignment="Bottom" Width="40" FontSize="40"/> <TextBlock HorizontalAlignment="Left" Height="45" Margin="675,0,0,101" TextWrapping="Wrap" Text="～" VerticalAlignment="Bottom" Width="40" FontSize="40"/>
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/> <Label Content="" HorizontalAlignment="Left" Height="30" Margin="450,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/>
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="65,0,0,50" VerticalAlignment="Bottom" Width="80" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/> <Label Content="" HorizontalAlignment="Left" Height="30" Margin="65,0,0,50" VerticalAlignment="Bottom" Width="80" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/>
<Button Content="查询" HorizontalAlignment="Left" Height="65" Margin="935,0,0,50" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Click"/> <Button Content="查询" HorizontalAlignment="Left" Height="65" Margin="965,0,0,50" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Click"/>
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>

2
ViewModel/QueryViewModel.cs
View File

@ -12,7 +12,7 @@ namespace Audit.ViewModel
///<Summary> ///<Summary>
/// QueryViewModel /// QueryViewModel
///</Summary> ///</Summary>
public class QueryViewModel: ViewModelBase public class QueryViewModel : ViewModelBase
{ {
private List<Dyelots> dyelots = new List<Dyelots>(); private List<Dyelots> dyelots = new List<Dyelots>();
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save