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

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

Browse Source
This commit is contained in:
sc committed 2022-02-17 23:55:45 +08:00
2 parents e1615e2add 51b7fffb4e
commit 474392a1d5
3 files changed
+20 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/QueryView.xaml
+16 -4
View File
@@ -15,7 +15,7 @@
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border>
<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" FontSize="15">
<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.RowStyle>
<Style TargetType="{x:Type DataGridRow}">
<Style.Triggers>
@@ -47,7 +47,7 @@
<DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
</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" FontSize="15">
<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">
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Style.Triggers>
@@ -86,8 +86,20 @@
<TextBox x:Name="Dyelots_Machine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1" MaxLength="9"/>
<TextBox x:Name="Dyelots_CreationTime" HorizontalAlignment="Left" Height="30" Margin="450,0,0,50" VerticalAlignment="Bottom" Width="225" FontSize="16" IsReadOnly="True" MaxLines="1"/>
<TextBox x:Name="Dyelots_ReDye" HorizontalAlignment="Left" Height="30" Margin="65,0,0,50" VerticalAlignment="Bottom" Width="80" FontSize="16" IsReadOnly="True" MaxLines="1"/>
<DatePicker x:Name="query_date_start" HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16" Cursor="No" SelectedDateFormat="Short"/>
<DatePicker x:Name="query_date_end" HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16" Cursor="No" SelectedDateFormat="Short"/>
<DatePicker x:Name="query_date_start" HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="15" Padding="1,1,0,1">
<DatePicker.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</DatePicker.Resources>
</DatePicker>
<DatePicker x:Name="query_date_end" HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="15" Padding="1,1,0,1">
<DatePicker.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</DatePicker.Resources>
</DatePicker>
<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="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
View/QueryView.xaml.cs
+3 -3
View File
@@ -33,16 +33,16 @@ namespace Audit.View
string DataGridDyelots_Button = this.Dyelots_Dyelot.Text;//传递工单输入框
string DataGridMachine_Button = this.Dyelots_Machine.Text;//传递机台输入框
string query_start = this.query_date_start.Text;//传递开始时间
string query_end = this.query_date_end.Text;//传递结束时间
int query_TimeCompare = DateTime.Compare(Convert.ToDateTime(query_start), Convert.ToDateTime(query_end)); //比较开始结束时间，小于-1 等于0 大于1
string query_end = this.query_date_end.Text;//传递结束时间
if (string.IsNullOrWhiteSpace(DataGridDyelots_Button))//工单为空进入下一步判断
{
if (string.IsNullOrWhiteSpace(query_start) && string.IsNullOrWhiteSpace(query_end))//判断查询时间是否存在
if (string.IsNullOrWhiteSpace(query_start) || string.IsNullOrWhiteSpace(query_end))//判断查询时间是否存在
{
MessageBox.Show("SC:无效查询信息");//返回无效信息弹窗
}
else
{
int query_TimeCompare = DateTime.Compare(Convert.ToDateTime(query_start), Convert.ToDateTime(query_end)); //比较开始结束时间，小于-1 等于0 大于1
if (query_TimeCompare == 1)//判断查询时间是否有效，等于1无效
{
MessageBox.Show("SC:无效查询时间");//返回无效时间弹窗
View/StatisticsView.xaml
+1 -5
View File
@@ -58,11 +58,7 @@
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border>
<Grid Grid.Row="0">
<RadioButton Content=" 染料" x:Uid="0" HorizontalAlignment="Left" Height="30" Margin="0,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
<RadioButton Content=" 助剂" x:Uid="1" HorizontalAlignment="Left" Height="30" Margin="100,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
<RadioButton Content="粉体助剂" x:Uid="2" HorizontalAlignment="Left" Height="30" Margin="200,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
</Grid>
<Grid Grid.Row="0"/>
<Grid Grid.Row="1">
<Grid Grid.Column="1">
<ContentControl x:Name="ContentControl" Margin="0,31,0,0"/>