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

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

master
忱 沈 4 years ago
parent
5c92071899 7cc3130eeb
commit
ed959085de
4 changed files with 35 additions and 25 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. 9
      Models/DyelotsBulkedRecipeProvider.cs
  2. 28
      View/QueryView.xaml
  3. 9
      View/QueryView.xaml.cs
  4. 14
      ViewModel/QueryViewModel.cs

9
Models/DyelotsBulkedRecipeProvider.cs
View File

@ -12,7 +12,12 @@ namespace Models
public int Delete(DyelotsBulkedRecipe t) public int Delete(DyelotsBulkedRecipe t)
{ {
throw new NotImplementedException(); if (t == null) return 0;
var model = db.DyelotsBulkedRecipe.ToList().FirstOrDefault(item => t.Dyelot == item.Dyelot);
if (model == null) return 0;
db.DyelotsBulkedRecipe.Remove(model);
int count = db.SaveChanges();
return count;
} }
public int Insert(DyelotsBulkedRecipe t) public int Insert(DyelotsBulkedRecipe t)
@ -22,7 +27,7 @@ namespace Models
public List<DyelotsBulkedRecipe> Select() public List<DyelotsBulkedRecipe> Select()
{ {
throw new NotImplementedException(); return db.DyelotsBulkedRecipe.SqlQuery("select TOP (10000) * from DyelotsBulkedRecipe").ToList();//查询前100条
} }
public int Update(DyelotsBulkedRecipe t) public int Update(DyelotsBulkedRecipe t)

28
View/QueryView.xaml
View File

@ -15,7 +15,7 @@
<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 x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick" ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40"> <DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick" ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled">
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Style.Triggers> <Style.Triggers>
@ -42,13 +42,13 @@
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}"/> <DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}" MaxWidth="158" MinWidth="158" CanUserReorder="False"/>
<DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}"/> <DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}" MaxWidth="56" MinWidth="56" CanUserReorder="False"/>
<DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/> <DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}" MaxWidth="90" MinWidth="90" CanUserReorder="False"/>
<DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0"/> <DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0" MinWidth="0" CanUserReorder="False"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<DataGrid 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"> <DataGrid x:Name="DataGridDyelotsBulkedRecipe" 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" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled">
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Style.Triggers> <Style.Triggers>
@ -66,7 +66,7 @@
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="DataGridCell"> <Style TargetType="DataGridCell">
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="MinWidth" Value="85"/> <Setter Property="MinWidth" Value="50"/>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsSelected" Value="False"> <Trigger Property="IsSelected" Value="False">
</Trigger> </Trigger>
@ -74,13 +74,13 @@
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="步骤" Width="50" FontSize="15" Binding="{Binding StepNumber}"/> <DataGridTextColumn Header="步骤" Width="50" FontSize="15" Binding="{Binding StepNumber}" MaxWidth="50" MinWidth="50" CanUserReorder="False"/>
<DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}"/> <DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
<DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}"/> <DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
<DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}"/> <DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
<DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}"/> <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
<DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed"/> <DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed" MinWidth="70" MaxWidth="150" CanUserReorder="False"/>
<DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"/> <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="200" MinWidth="500" CanUserReorder="False"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </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"/> <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"/>

9
View/QueryView.xaml.cs
View File

@ -66,15 +66,6 @@ namespace Audit.View
} }
} }
private void DataGrid_Detailed(object sender, SelectionChangedEventArgs e)
{
}
private void DataGrid_Directory(object sender, SelectionChangedEventArgs e)
{
}
private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件 private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件
{ {
int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量 int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量

14
ViewModel/QueryViewModel.cs
View File

@ -15,6 +15,7 @@ namespace Audit.ViewModel
public class QueryViewModel : ViewModelBase public class QueryViewModel : ViewModelBase
{ {
private List<Dyelots> dyelots = new List<Dyelots>(); private List<Dyelots> dyelots = new List<Dyelots>();
private List<DyelotsBulkedRecipe> dyelotsBulkedRecipe = new List<DyelotsBulkedRecipe>();
/// <summary> /// <summary>
/// 所有工单 /// 所有工单
/// </summary> /// </summary>
@ -30,12 +31,25 @@ namespace Audit.ViewModel
RaisePropertyChanged(); RaisePropertyChanged();
} }
} }
public List<DyelotsBulkedRecipe> DyelotsBulkedRecipe
{
get
{
return dyelotsBulkedRecipe;
}
set
{
dyelotsBulkedRecipe = value;
RaisePropertyChanged();
}
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public QueryViewModel() public QueryViewModel()
{ {
dyelots = new DyelotsProvider().Select(); dyelots = new DyelotsProvider().Select();
dyelotsBulkedRecipe = new DyelotsBulkedRecipeProvider().Select();
} }
} }

Write Preview
Loading…
Cancel
Save