|
|
|
|
@ -7,10 +7,73 @@
|
|
|
|
|
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>
|
|
|
|
|
d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" >
|
|
|
|
|
|
|
|
|
|
<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 +117,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 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 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 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 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 FontSize="20" Text="{Binding BeginTime}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
|
|
|
|
|
</StackPanel>
|
|
|
|
|
</Grid>
|
|
|
|
|
</Border>
|
|
|
|
|
@ -178,10 +241,20 @@
|
|
|
|
|
<Grid Margin="10,10">
|
|
|
|
|
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
|
|
|
|
|
<lvc:CartesianChart.AxisX>
|
|
|
|
|
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" Foreground="#0288d1"/>
|
|
|
|
|
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" Foreground="#0288d1">
|
|
|
|
|
<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" Foreground="#0288d1"/>
|
|
|
|
|
<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>
|
|
|
|
|
@ -210,24 +283,24 @@
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.RowDefinitions>
|
|
|
|
|
<RowDefinition Height="6*"/>
|
|
|
|
|
<RowDefinition Height="*"/>
|
|
|
|
|
<RowDefinition Height="1.3*"/>
|
|
|
|
|
</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" >
|
|
|
|
|
<!--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 +322,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"/>
|
|
|
|
|
<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="15">
|
|
|
|
|
<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 +357,20 @@
|
|
|
|
|
<Grid Margin="10,10">
|
|
|
|
|
<lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}">
|
|
|
|
|
<lvc:CartesianChart.AxisX>
|
|
|
|
|
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15" Foreground="#0288d1"/>
|
|
|
|
|
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15" Foreground="#0288d1">
|
|
|
|
|
<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" Foreground="#0288d1"/>
|
|
|
|
|
<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>
|
|
|
|
|
|
liuwf
11 months ago