wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 调整样式

Browse Source
foamRearStore
liuwf 1 year ago
parent f6436cee4f
commit 3c5a4779b1
19 changed files with 984 additions and 395 deletions
Show Stats Download Patch File Download Diff File

1
Aucma.Scada.HikRobot/GrabImage.cs
Unescape Escape View File

@ -55,7 +55,6 @@ namespace Aucma.Scada.HikRobot
{
}
public void InitHikRobot()
{
int nRet = MvCodeReader.MV_CODEREADER_OK;

15
Aucma.Scada.UI/App.xaml
Unescape Escape View File

@ -6,6 +6,21 @@
<Application.Resources>
<!--Button样式-->
<ResourceDictionary>
<Style x:Key="TextBoxStyle" TargetType="TextBox">
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TextBox">
<Grid>
<ScrollViewer x:Name="PART_ContentHost" Margin="0" VerticalAlignment="Center"/>
<Rectangle StrokeThickness="0" Height="1" VerticalAlignment="Bottom" Fill="Gray"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="templates/style/resourceStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>

111
Aucma.Scada.UI/MainWindow.xaml
Unescape Escape View File

@ -3,7 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI"
xmlns:local="clr-namespace:Aucma.Scada.UI" FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="True">
@ -50,7 +51,7 @@
</Grid>
</StackPanel>-->
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="澳柯玛生产控制系统" FontSize="50" Foreground="White" FontWeight="Bold"/>
<TextBlock Text="澳柯玛生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
</StackPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
@ -81,104 +82,20 @@
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
<Button Content="入库监控" x:Name="instoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="出库监控" x:Name="outstoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="任务列表" x:Name="taskInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="实时库存" x:Name="inventoryInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="组装计划" x:Name="assemblyPlan" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="入库监控" x:Name="instoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="出库监控" x:Name="outstoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="任务列表" x:Name="taskInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="实时库存" x:Name="inventoryInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="生产计划" x:Name="assemblyPlan" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<!--<Button Content="日 志" x:Name="logInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=logInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
<!--<Button Content="记 录" x:Name="record" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=record}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
<Button Content="键 盘" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
<Button Content="键 盘" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0" FontSize="17"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0" FontSize="17"/>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal">
<!--多行状态显示-->
<!--<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Margin="0,0,0,0" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="1">
<TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
</StackPanel>
<StackPanel Grid.Column="0">
<Ellipse Width="20" Height="20">
<Ellipse.Style>
<Style TargetType="Ellipse">
<Style.Triggers>
<DataTrigger Binding="{Binding PresentColor}" Value="0">
<Setter Property="Shape.Fill" Value="Orange"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="1">
<Setter Property="Shape.Fill" Value="Green"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="2">
<Setter Property="Shape.Fill" Value="Red"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Ellipse.Style>
</Ellipse>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
<StackPanel Grid.Row="1" Margin="0,10,0,0" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="1">
<TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
</StackPanel>
<StackPanel Grid.Column="0">
<Ellipse Width="20" Height="20">
<Ellipse.Style>
<Style TargetType="Ellipse">
<Style.Triggers>
<DataTrigger Binding="{Binding PresentColor}" Value="0">
<Setter Property="Shape.Fill" Value="Orange"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="1">
<Setter Property="Shape.Fill" Value="Green"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="2">
<Setter Property="Shape.Fill" Value="Red"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Ellipse.Style>
</Ellipse>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
</Grid>-->
<!--单行状态显示-->
<Grid>
@ -214,7 +131,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="箱壳扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
<TextBlock Text="箱壳扫码器" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>
@ -245,7 +162,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="内胆扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
<TextBlock Text="内胆扫码器" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>
@ -276,7 +193,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="PLC状态" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
<TextBlock Text="PLC状态" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>

150
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
Unescape Escape View File

@ -6,11 +6,73 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Control.Resources>
mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources>
<local1:PlanStatusConverter x:Key="PlanStatusConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
@ -54,28 +116,28 @@
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="工位名称" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding StationName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
<TextBlock Text="工位名称" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding StationName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="订单编号" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding OrderCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
<TextBlock Text="订单编号" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding OrderCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="计划编号" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding PlanCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
<TextBlock Text="计划编号" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="产品型号" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding ProductModel}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
<TextBlock Text="产品型号" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ProductModel}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="开始时间" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding BeginTime}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
<TextBlock Text="开始时间" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding BeginTime}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
</Grid>
</Border>
@ -98,7 +160,7 @@
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="计划数量" FontSize="15" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="计划数量" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="100" Value="{Binding PlanAmount}" Foreground="#0288d1"/>
@ -113,7 +175,7 @@
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="实际数量" FontSize="15" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="实际数量" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="100" Value="{Binding ComplateAmout}" Foreground="#0288d1"/>
@ -128,7 +190,7 @@
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="差异数量" FontSize="15" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="差异数量" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="100" Value="{Binding DiffAmount}" Foreground="#0288d1"/>
@ -143,7 +205,7 @@
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="完成率" FontSize="15" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="完成率" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="100" Value="{Binding CompleRoution}" Foreground="#0288d1"/>
@ -178,10 +240,20 @@
<Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15"/>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="20">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15"/>
<lvc:Axis FontSize="20">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
</Grid>
@ -214,20 +286,20 @@
</Grid.RowDefinitions>
<DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground= "#FFFFFF" >
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>-->
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding endTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="完成时间" Width="1*" IsReadOnly="True"/>-->
<!--<DataGridTextColumn Binding="{Binding createdTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>-->
<DataGridTemplateColumn Header="操作" Width="2*">
@ -249,13 +321,13 @@
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
<TextBlock Text="执行方式" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="15">
<TextBlock Text="执行方式" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="20">
<ComboBoxItem Content="手动" IsSelected="True"/>
<ComboBoxItem Content="自动" />
</ComboBox>
<Button Content="计划维护" Command="{Binding PlanInfoEditCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="30" Margin="20,0,0,0"/>
<Button Content="物料库存" Command="{Binding MaterialStatisticsCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="30" Margin="20,0,0,0"/>
<Button Content="计划创建" Command="{Binding PlanInfoEditCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
<Button Content="物料库存" Command="{Binding MaterialStatisticsCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
</StackPanel>
</Border>
</Grid>
@ -284,10 +356,20 @@
<Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}">
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15"/>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="20">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15"/>
<lvc:Axis FontSize="20">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
</Grid>

107
Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
Unescape Escape View File

@ -6,8 +6,71 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
mc:Ignorable="d"
Title="MES生产计划" Height="650" Width="900" Name="window" Background="White"
Title="MES生产计划" Height="650" Width="900" Name="window" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" Background="#1152AC"
ResizeMode="NoResize" Topmost="True">
<Window.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<!--<Setter Property="Foreground" Value="#dddddd"/>-->
</Trigger>
</Style.Triggers>
</Style>
</Window.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect>
@ -26,12 +89,12 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="工单编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="工单编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
<!--resourceStyle 413行修改边框颜色-->
<Button Content="查 询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="重 置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="配 置" Command="{Binding SearchCriteriaSetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="查 询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
<Button Content="重 置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
<Button Content="配 置" Command="{Binding SearchCriteriaSetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
</StackPanel>
<Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
@ -43,7 +106,7 @@
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="15*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="产品型号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Grid.Column="0" Text="产品型号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
<ItemsControl Grid.Column="1" ItemsSource="{Binding Configurations}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@ -57,7 +120,7 @@
Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"
GroupName="MaterialTypeRadioButton"
Margin="20,10" FontSize="15" Foreground="#FFFFFF"/>
Margin="20,10" FontSize="20" Foreground="#FFFFFF"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@ -74,19 +137,19 @@
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<DataGrid Name="dataGrid" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Border>
@ -101,16 +164,16 @@
<RowDefinition/>
</Grid.RowDefinitions>
<!--<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="计划编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox FontSize="15" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="产品型号" FontSize="15" Foreground="#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="下达数量" FontSize="15" Foreground="#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
<TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
</StackPanel>-->
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
<!--<Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />-->
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" />
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" FontSize="18" Height="40" BorderBrush="#FF9900" Width="80" />
</StackPanel>
</Grid>
</Border>

36
Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
Unescape Escape View File

@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
mc:Ignorable="d"
Title="下达数量" Height="500" Width="700" Name="window" Background="White"
mc:Ignorable="d" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen" Background="#1152AC"
Title="下达数量" Height="500" Width="700" Name="window"
ResizeMode="NoResize" Topmost="True">
<Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect>
@ -33,25 +33,25 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="计划编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="planCode" FontSize="15" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" x:Name="planCode" FontSize="20" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="工单编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="orderCode" FontSize="15" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="工单编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" x:Name="orderCode" FontSize="20" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="产品型号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="materialCode" FontSize="15" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" x:Name="materialCode" FontSize="20" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="计划数量" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox FontSize="15" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="计划数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="完成数量" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox FontSize="15" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="完成数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
</Grid>
</Border>
@ -68,8 +68,8 @@
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="下达数量" FontSize="15" Foreground="#FFFFFF" Height="40" Margin="10,0,0,0"/>
<TextBox x:Name="TransmitAmount" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF" Height="40" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" x:Name="TransmitAmount" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<Border Grid.Row="1" BorderBrush="Black" BorderThickness="0" Margin="10">
@ -95,14 +95,14 @@
<Button Grid.Row="2" Grid.Column="1" Content="8" FontSize="18" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
<Button Grid.Row="2" Grid.Column="2" Content="9" FontSize="18" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
<Button Grid.Row="3" Grid.Column="0" Content="0" FontSize="18" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
<Button Grid.Row="3" Grid.Column="2" Content="清除" FontSize="15" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900" Command="{Binding ClearTransmitAmountCommand}"/>
<!--<Button Grid.Row="3" Grid.Column="2" Content="下达" FontSize="15" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#FF36B5C1" Foreground="white" BorderBrush="#FF36B5C1" Command="{Binding PlanInfoTransmitCommand}"/>-->
<Button Grid.Row="3" Grid.Column="2" Content="清除" FontSize="20" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900" Command="{Binding ClearTransmitAmountCommand}"/>
<!--<Button Grid.Row="3" Grid.Column="2" Content="下达" FontSize="20" Margin="2,2" Style="{StaticResource BUTTON_AGREE}" Background="#FF36B5C1" Foreground="white" BorderBrush="#FF36B5C1" Command="{Binding PlanInfoTransmitCommand}"/>-->
</Grid>
</Border>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="计划下达" FontSize="15" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
<Button Content="取 消" FontSize="15" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
<Button Content="计划下达" FontSize="20" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#4285DE" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
<Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
</StackPanel>
</Grid>
</Border>

24
Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml
Unescape Escape View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
mc:Ignorable="d"
Title="搜索条件配置" Height="350" Width="600" Name="window" Background="White"
Title="搜索条件配置" Height="350" Width="600" Name="window" Background="#1152AC" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei"
ResizeMode="NoResize" Topmost="True">
<Window.Resources>
<Style x:Key="CustomTextBoxStyle" TargetType="TextBox">
@ -59,7 +59,7 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBox x:Name="YourTextBoxName" Style="{StaticResource CustomTextBoxStyle}" Text="{Binding Path=. , Mode=TwoWay ,UpdateSourceTrigger=PropertyChanged}" />
<TextBox Style="{StaticResource TextBoxStyle}" x:Name="YourTextBoxName" Style="{StaticResource CustomTextBoxStyle}" Text="{Binding Path=. , Mode=TwoWay ,UpdateSourceTrigger=PropertyChanged}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>-->
@ -70,19 +70,19 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBox Text="{Binding Configurations[0], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[1], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[2], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[3], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[4], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[0], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[1], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[2], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[3], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[4], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBox Text="{Binding Configurations[5], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[6], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[7], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[8], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Text="{Binding Configurations[9], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[5], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[6], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[7], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[8], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding Configurations[9], Mode=TwoWay}" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
</StackPanel>
</Grid>

134
Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
Unescape Escape View File

@ -6,11 +6,73 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Control.Resources>
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources>
<local1:TaskStatusConverter x:Key="TaskStatusConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
@ -47,24 +109,24 @@
<RowDefinition Height="4*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料条码：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding MaterialCode}" Foreground= "#FFFFFF" Width="200" Height="40" IsReadOnly="True"/>
<TextBox FontSize="15" Text="{Binding ScanTime}" Foreground= "#FFFFFF" Width="200" Height="40" IsReadOnly="True" Margin="20,0,0,0"/>
<TextBlock Text="物料条码：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialCode}" Foreground= "#FFFFFF" Width="200" Height="40" IsReadOnly="True"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ScanTime}" Foreground= "#FFFFFF" Width="200" Height="40" IsReadOnly="True" Margin="20,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料名称：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding MaterialName}" Foreground= "#FFFFFF" Width="420" Height="40" IsReadOnly="True"/>
<TextBlock Text="物料名称：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialName}" Foreground= "#FFFFFF" Width="420" Height="40" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="入库货道：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding SpaceName}" Foreground= "#FFFFFF" Width="420" Height="40" IsReadOnly="True"/>
<TextBlock Text="入库货道：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding SpaceName}" Foreground= "#FFFFFF" Width="420" Height="40" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="提示信息：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding PromptInfo}" Foreground= "#FFFFFF" Width="420" Height="100" IsReadOnly="True"/>
<TextBlock Text="提示信息：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PromptInfo}" Foreground= "#FFFFFF" Width="420" Height="100" IsReadOnly="True"/>
</StackPanel>
</Grid>
@ -92,10 +154,20 @@
<Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15"/>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="20">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15"/>
<lvc:Axis FontSize="15">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
</Grid>
@ -110,40 +182,40 @@
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="1.2*"/>
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="物料条码" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="物料条码" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
<!--resourceStyle 413行修改边框颜色-->
<!--<TextBlock Text="物料类型" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="15">
<!--<TextBlock Text="物料类型" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="20">
<ComboBoxItem Content="所有" IsSelected="True"/>
<ComboBoxItem Content="箱壳" />
<ComboBoxItem Content="内胆" />
</ComboBox>-->
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
<Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
</StackPanel>
</Border>
<DataGrid Grid.Row="1" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground= "#FFFFFF" >
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="入库状态" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="入库状态" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
@ -162,7 +234,7 @@
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="系统日志" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<!--日志信息-->

81
Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml
Unescape Escape View File

@ -5,11 +5,74 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Control.Resources>
mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="450" d:DesignWidth="900">
<UserControl.Resources>
<local1:StatusLabelConverter x:Key="StatusLabelConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
@ -178,20 +241,20 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>

12
Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
Unescape Escape View File

@ -4,17 +4,17 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="750" d:DesignWidth="1920" >
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="1.2*"/>
<RowDefinition Height="14*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
<Button Content="箱壳库" x:Name="shellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="内胆库" x:Name="linerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="泡后库" x:Name="boxFoamRearInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=boxFoamRearInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="箱壳库" x:Name="shellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="40" FontSize="20" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="内胆库" x:Name="linerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="40" FontSize="20" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="泡后库" x:Name="boxFoamRearInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=boxFoamRearInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="40" FontSize="20" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
</StackPanel>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">

78
Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
Unescape Escape View File

@ -5,11 +5,73 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
mc:Ignorable="d"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="450" d:DesignWidth="800">
<Control.Resources>
<UserControl.Resources>
<local1:StatusLabelConverter x:Key="StatusLabelConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@ -177,20 +239,20 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>

85
Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
Unescape Escape View File

@ -4,9 +4,72 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d"
Title="物料库存统计" Height="650" Width="1000" Name="window" Background="White"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
Title="物料库存统计" Height="650" Width="1000" Name="window"
ResizeMode="NoResize" Topmost="True">
<Window.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<!--<Setter Property="Foreground" Value="#dddddd"/>-->
</Trigger>
</Style.Triggers>
</Style>
</Window.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
@ -32,11 +95,11 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="箱 壳 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="箱 壳 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding ShellMaterialStockDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@ -62,11 +125,11 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="内 胆 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="内 胆 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding LinerMaterialStockDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@ -91,11 +154,11 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="泡 前 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="泡 前 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding FoamBeforeMaterialStockDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@ -120,7 +183,7 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
</Grid>
@ -131,8 +194,8 @@
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
<Button Content="刷 新" Command="{Binding RefreshCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="30" Margin="20,0,0,0"/>
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" />
<Button Content="刷 新" Command="{Binding RefreshCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="40" FontSize="20" Margin="20,0,0,0"/>
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="40" FontSize="20" BorderBrush="#FF9900" Width="80" />
</StackPanel>
</Border>
</Grid>

80
Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
Unescape Escape View File

@ -5,11 +5,73 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
<Control.Resources>
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="450" d:DesignWidth="800" >
<UserControl.Resources>
<local1:StatusLabelConverter x:Key="StatusLabelConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
@ -178,20 +240,20 @@
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="20"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>

91
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
Unescape Escape View File

@ -4,9 +4,72 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
Title="{Binding TitleName}" Height="450" Width="800" Name="window">
<Border Margin="5" Background="White" CornerRadius="10">
<Window.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<!--<Setter Property="Foreground" Value="#dddddd"/>-->
</Trigger>
</Style.Triggers>
</Style>
</Window.Resources>
<Border Margin="5" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
@ -18,11 +81,11 @@
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="20"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
<!--resourceStyle 413行修改边框颜色-->
<TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
<TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="20" Margin="20,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
@ -30,21 +93,21 @@
</StackPanel>
</Border>
<!--计划列表-->
<Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<DataGrid Name="dataGrid" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="Gray" SelectedItem="{Binding SelectedDataItem}">
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialAmount}" Header="物料数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialAmount}" Header="物料数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Border>

132
Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
Unescape Escape View File

@ -5,11 +5,73 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Control.Resources>
mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920">
<UserControl.Resources>
<local1:TaskStatusConverter x:Key="TaskStatusConverter" />
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition/>
@ -57,18 +119,18 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="任务编号：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding TaskCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="任务编号：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding TaskCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="计划编号：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding PlanCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="计划编号：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="订单信息：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding OrderCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="订单信息：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding OrderCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
</Grid>
</Border>
@ -84,18 +146,18 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料条码：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding MaterialCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="物料条码：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialCode}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料名称：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding MaterialName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="物料名称：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="出库货道：" FontSize="15" Foreground= "#FFFFFF"/>
<TextBox FontSize="15" Text="{Binding SpaceName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
<TextBlock Text="出库货道：" FontSize="20" Foreground= "#FFFFFF"/>
<TextBox Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding SpaceName}" Foreground= "#FFFFFF" Width="200" IsReadOnly="True"/>
</StackPanel>
</Grid>
</Border>
@ -146,41 +208,41 @@
</Border>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="任务编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="任务编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
<TextBlock Text="物料编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="物料编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
<TextBlock Text="计划编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="计划编号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground= "#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
<!--<TextBlock Text="产品型号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="150" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="15">
<!--<TextBlock Text="产品型号" VerticalAlignment="Center" Foreground= "#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="150" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="20">
<ComboBoxItem Content="所有" IsSelected="True"/>
<ComboBoxItem Content="SC232" />
<ComboBoxItem Content="SC485" />
</ComboBox>-->
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
<Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
</StackPanel>
</Border>
<DataGrid Grid.Row="2" Name="DG" ItemsSource="{Binding OutstoreTask}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground= "#FFFFFF" >
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTemplateColumn Header="操作" Width="*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>

98
Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
Unescape Escape View File

@ -5,20 +5,82 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Control.Resources>
mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources>
<local1:TaskStatusConverter x:Key="TaskStatusConverter" />
<local1:TaskTypeConverter x:Key="TaskTypeConverter"/>
</Control.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="14*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
<Button Content="入库任务" x:Name="inStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="出库任务" x:Name="outStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="入库任务" x:Name="inStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="出库任务" x:Name="outStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
</StackPanel>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
@ -34,23 +96,23 @@
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<DataGrid ItemsSource="{Binding TaskInfoDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground= "#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="执行时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="执行时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Border>
@ -60,7 +122,7 @@
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<DataGrid ItemsSource="{Binding RecordInfoDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"

6
Aucma.Scada.UI/RecordControl.xaml
Unescape Escape View File

@ -19,8 +19,8 @@
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<StackPanel Margin="15,0" Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="用户名称" VerticalAlignment="Center" Foreground="Black" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="White" VerticalAlignment="Center" FontSize="15"/> <!--resourceStyle 413行修改边框颜色-->
<TextBlock Text="用户名称" VerticalAlignment="Center" Foreground="Black" FontSize="20"/>
<TextBox Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="White" VerticalAlignment="Center" FontSize="20"/> <!--resourceStyle 413行修改边框颜色-->
<Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
<Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
@ -31,7 +31,7 @@
<Border Grid.Row="1" Margin="0,5,0,0" BorderBrush="#007DFA" BorderThickness="0" CornerRadius="0" Background="Transparent">
<DataGrid ItemsSource="{Binding GridModelList}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="30" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"

59
Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.g.i.cs
Unescape Escape View File

@ -1,4 +1,5 @@
#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A51C0173382E23F6BDF3BBFA25E3B2691BB23C31E7312C858FC4A50E67F5C44"
// Updated by XamlIntelliSenseFileGenerator 2023-12-07 11:06:34
#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A51C0173382E23F6BDF3BBFA25E3B2691BB23C31E7312C858FC4A50E67F5C44"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -32,53 +33,50 @@ using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.AssemblyPlan {
namespace Aucma.Scada.UI.Page.AssemblyPlan
{
/// <summary>
/// QuantityIssuedWindow
/// </summary>
public partial class QuantityIssuedWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Aucma.Scada.UI.Page.AssemblyPlan.QuantityIssuedWindow window;
public partial class QuantityIssuedWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
{
#line default
#line hidden
#line default
#line hidden
#line 37 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
#line 37 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox planCode;
#line default
#line hidden
#line default
#line hidden
#line 41 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
#line 41 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox orderCode;
#line default
#line hidden
#line default
#line hidden
#line 45 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
#line 45 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox materialCode;
#line default
#line hidden
#line default
#line hidden
#line 72 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
#line 72 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox TransmitAmount;
#line default
#line hidden
#line default
#line hidden
private bool _contentLoaded;
@ -87,18 +85,20 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
public void InitializeComponent()
{
if (_contentLoaded)
{
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/assemblyplan/quantityissuedwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
#line 1 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -107,7 +107,8 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
{
switch (connectionId)
{
case 1:
@ -128,6 +129,8 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
}
this._contentLoaded = true;
}
internal System.Windows.Window window;
}
}

3
Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Windows.Media;
namespace Aucma.Scada.UI.viewModel.InStoreInfo
{
@ -284,7 +285,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
column.DataLabels = true;
column.Title = "泡后库";
column.Values = achievement;
column.Foreground = Brushes.White;
Achievement.Add(column);
}));
}

Write Preview
Loading…
Cancel
Save