liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 4007871deb
commit eae7c0a047
14 changed files with 164 additions and 67 deletions
Show Stats Download Patch File Download Diff File

75
Admin.Core.Api/Admin.Core.Model.xml
Unescape Escape View File

@ -1106,6 +1106,46 @@
plc放行标志，2为放行通过，1为pda提示需要放行记录
</summary>
</member>
<member name="T:Admin.Core.Model.DetailElectricalinspection">
<summary>
电检数据明细
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Uuid">
<summary>
标识
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Serialnumber">
<summary>
序号
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Projectname">
<summary>
项目名称
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Testcondition">
<summary>
测试条件
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Testvalue">
<summary>
测试值
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Testresult">
<summary>
测试结果
</summary>
</member>
<member name="P:Admin.Core.Model.DetailElectricalinspection.Recordtime">
<summary>
记录时间
</summary>
</member>
<member name="T:Admin.Core.Model.DoorFoamRecord">
<summary>
门体发泡记录
@ -1646,6 +1686,41 @@
创建时间
</summary>
</member>
<member name="T:Admin.Core.Model.RecordElectricalinspection">
<summary>
电检数据记录
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Uuid">
<summary>
唯一标识
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Result">
<summary>
测试总结果
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Barcode">
<summary>
产品条码
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Testtime">
<summary>
测试时间
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Testdata">
<summary>
测试数据
</summary>
</member>
<member name="P:Admin.Core.Model.RecordElectricalinspection.Recordtime">
<summary>
记录时间
</summary>
</member>
<member name="T:Admin.Core.Model.RecordInStore">
<summary>
入库记录

3
Aucma.Core.PrintTo/App.xaml
Unescape Escape View File

@ -24,14 +24,15 @@
<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="#DDFFFFFF" />
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#DDFFFFFF" />
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#DDFFFFFF" />
<!--字体大小设置-->
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="20"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>

27
Aucma.Core.PrintTo/Views/IndexPageView.xaml
Unescape Escape View File

@ -6,8 +6,9 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="800"
Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignWidth="1500" FontSize="18">
Background="#1152AC"
FontFamily="Microsoft YaHei"
d:DesignWidth="1500" FontSize="20">
<UserControl.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<!--<Setter Property="Height" Value="40"/>-->
@ -101,7 +102,7 @@
<Setter Property="Focusable" Value="false" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Padding" Value="0" />
<Setter Property="Width" Value="30" />
<Setter Property="Width" Value="50" />
</Style>
</Style.Resources>
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
@ -164,7 +165,7 @@
<WrapPanel Grid.Row="0" Margin="5 5 0 0">
<Label Content="查询条件" VerticalAlignment="Center" Foreground="White" />
<TextBox x:Name="queryParam" Text="" Style="{x:Null}" PreviewMouseDoubleClick="queryParam_PreviewMouseDown" Width="300" HorizontalAlignment="Left" VerticalContentAlignment="Center"/>
<Button Content="查询" Background="#4285DE" Width="100" Margin="5 0" Command="{Binding QueryStringCommand}" CommandParameter="{Binding Text, ElementName=queryParam}"/>
<Button Content="查询" Background="#4285DE" Width="100" Height="40" Margin="5 0" Command="{Binding QueryStringCommand}" CommandParameter="{Binding Text, ElementName=queryParam}"/>
</WrapPanel>
<UniformGrid Grid.Row="1" Margin="0 5 0 0" x:Name="HeightPanel">
<!--
@ -207,28 +208,28 @@
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="产品编码" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBlock Text="产品编码" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0 " FontSize="18" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="400"
materialDesign:HintAssist.Hint="产品编码" />
</WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="产品名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBlock Text="产品名称" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="ProductName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="18" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
materialDesign:HintAssist.Hint="产品名称" />
</WrapPanel>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="物料名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBlock Text="物料名称" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="MaterialName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="18" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
materialDesign:HintAssist.Hint="物料名称" />
</WrapPanel>
<WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBlock Text="打印数量" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<Slider x:Name="PlanAmount" FontSize="18" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="White" Height="30" VerticalContentAlignment="Center"
HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"/>
<!--<TextBlock Text="1~500" Width="60" Margin="10 0 0 0" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />-->
</WrapPanel>
<Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="100 5" >
<Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="20 5" >
<StackPanel >
<WrapPanel Height="300">
<RadioButton Content="内胆码-L" Foreground="White" FontSize="20" BorderBrush="White" x:Name="内胆" Margin="30 15" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name, ElementName=内胆}"/>
@ -239,18 +240,18 @@
</Border>
<WrapPanel Grid.Row="5" HorizontalAlignment="Center">
<Button
Background="#4285DE"
Background="#4285DE" Height="40"
Content="常规" Width="100" Margin="0 10 0 0" Command="{Binding PrintCommand}" IsEnabled="{Binding PrintIsEnabled}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"/>
<Button
Background="#4285DE"
Background="#4285DE" Height="40"
Content="补打" Margin="10 10 0 0" Width="100" Command="{Binding SupplementPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE"
Background="#4285DE" Height="40"
Content="追加" Margin="10 10 0 0" Width="100" Command="{Binding AppendPrintPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE"
Background="#4285DE" Height="40"
Content="特殊" Margin="10 10 0 0" Width="100" Command="{Binding SpecialPrintCommand}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
</WrapPanel>

14
Aucma.Core.PrintTo/Views/MainWindow.xaml
Unescape Escape View File

@ -12,7 +12,7 @@
FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowState="Maximized"
WindowStyle="ToolWindow"
WindowStyle="None"
>
<Border CornerRadius="5">
<Border.Effect>
@ -50,16 +50,16 @@
</DockPanel>
<DockPanel Grid.Row="2">
<Border Margin="3 0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<Border Margin="5" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="首 页" Margin="5 0" />
<Button Content="键 盘" x:Name="TabTip" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" x:Name="Exit" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Background="#FF0033" BorderBrush="#FF0033" />
<StackPanel Grid.Row="1" Height="60" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="首 页" Margin="5 0" Height="40"/>
<Button Content="键 盘" x:Name="TabTip" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" x:Name="Exit" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Background="#FF0033" BorderBrush="#FF0033" />
</StackPanel>
</Grid>
</Border>

7
Aucma.Core.SheetMetal/App.xaml
Unescape Escape View File

@ -26,8 +26,13 @@
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="White" />
<!--字体大小设置-->
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="15"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
<!--<Setter Property="FontSize" Value="15" />-->
</Style>
<Style TargetType="{x:Type Window}">
<Setter Property="FontSize" Value="18" />
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
</ResourceDictionary>
</Application.Resources>

8
Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -109,6 +109,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
column.Title = "前板";
column.Values = achievement;
column.Foreground = Brushes.White;
column.FontSize = 18;
//柱子宽度
//column.Width = 30;
//column.MaxColumnWidth = 30;
@ -129,8 +130,9 @@ namespace Aucma.Core.SheetMetal.ViewModels
Title = "后板",
Values = achievement,
Fill = new SolidColorBrush(Color.FromRgb(15,209,226)),
Foreground = Brushes.CadetBlue
});
Foreground = Brushes.CadetBlue,
FontSize = 18
});
#endregion
@ -146,6 +148,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
column2.Title = "前板";
column2.Values = achievement2;
column2.Foreground = Brushes.White;
column2.FontSize = 18;
ModelStatistics.Add(column2);
ModelStatistics.Add(new ColumnSeries()
@ -155,6 +158,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
Values = achievement2,
Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)),
Foreground = Brushes.White,
FontSize = 18
});
MaterialNameList = new List<string>()

34
Aucma.Core.SheetMetal/Views/IndexPageView.xaml
Unescape Escape View File

@ -5,13 +5,15 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
mc:Ignorable="d"
Background="#1152AC"
FontFamily="Microsoft YaHei"
d:DesignHeight="1080"
d:DesignWidth="1920" >
<UserControl.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="15"/>
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
@ -43,6 +45,7 @@
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
<!--单元格样式-->
@ -190,7 +193,7 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,0,0" >
<lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="{Binding PlanMaxNum,Mode=TwoWay}"
Value="{Binding RealQuantity,Mode=TwoWay}"
Foreground="White"/>
Foreground="White" />
</Border>
</Grid>
</Border>
@ -251,12 +254,12 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" LegendLocation="Top" Foreground="White">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" LegendLocation="Top" Foreground="White">
<lvc:CartesianChart.DataTooltip >
<lvc:DefaultTooltip SelectionMode="OnlySender" BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
</lvc:CartesianChart.DataTooltip>
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="12" LabelsRotation="0" DisableAnimations="True" Position="LeftBottom" Foreground="White">
<lvc:CartesianChart.AxisX >
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="18" Foreground="White" LabelsRotation="0" DisableAnimations="True" Position="LeftBottom" >
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" Step="1" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>
@ -264,7 +267,7 @@
</lvc:Axis>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="18" Foreground="White" >
<lvc:Axis FontSize="18" Foreground="White">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
@ -308,6 +311,7 @@
<DataGridTextColumn Binding="{Binding TaskAmount}" Header="计划" Width="0.6*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="完成" Width="0.6*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding PlanType}" Header="计划类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding PlanType}" Header="配方" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BeginTime ,StringFormat=\{0:MM-dd HH:mm\}}" Header="开始时间" Width="1.2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ExecuteStatus}" Header="执行状态" Visibility="Collapsed"/>
@ -328,13 +332,13 @@
</DataGrid.Columns>
</DataGrid>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0,0,0,1">
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0,0,0,1" >
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
<TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="White" FontSize="18" Margin="20,0,0,0"/>
<ComboBox Width="200" Height="30" Margin="10 0 0 0"
<TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="White" FontSize="20" Margin="20,0,0,0"/>
<ComboBox Width="200" Height="30" Margin="10 0 0 0" FontSize="18"
ItemsSource="{Binding LocationSource,Mode=OneWay}"
Style="{x:Null}" Background="#1152AC" VerticalAlignment="Center" FontSize="15"
Style="{x:Null}" Background="#1152AC" VerticalAlignment="Center"
SelectedItem="{Binding SelectLocation,Mode=TwoWay}"
SelectedValuePath="SelectedModel"
DisplayMemberPath="TypeName"
@ -342,8 +346,8 @@
<!--<ComboBoxItem Content="手动" IsSelected="True"/>
<ComboBoxItem Content="自动" />-->
</ComboBox>
<Button Content="计划创建" Command="{Binding SplitPlanCommand}" Margin="20,0,0,0" BorderThickness="1" />
<Button Content="物料库存" Command="{Binding InventoryStatisticsCommand}" Margin="20,0,0,0" BorderThickness="1" />
<Button Content="计划创建" Command="{Binding SplitPlanCommand}" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
<Button Content="物料库存" Command="{Binding InventoryStatisticsCommand}" Margin="20,0,0,0" FontSize="18" Height="40" BorderThickness="1" />
</StackPanel>
</Border>
</Grid>
@ -369,8 +373,8 @@
<lvc:CartesianChart.DataTooltip>
<lvc:DefaultTooltip BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
</lvc:CartesianChart.DataTooltip>
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="12" Foreground="White">
<lvc:CartesianChart.AxisX FontSize ="18">
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="18" Foreground="White">
<lvc:Axis.Separator>
<lvc:Separator Step="1" Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>

2
Aucma.Core.SheetMetal/Views/LogPageView.xaml
Unescape Escape View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views"
mc:Ignorable="d" Background="#1152AC"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="450" d:DesignWidth="800"
>
<Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="5 15 5 5">

24
Aucma.Core.SheetMetal/Views/MainWindow.xaml
Unescape Escape View File

@ -7,8 +7,10 @@
mc:Ignorable="d"
Title="澳柯玛生产控制系统" Icon="/Assets/images/Icon.png"
d:DesignHeight="1080"
d:DesignWidth="1920" FontFamily="Microsoft YaHei"
MinHeight="1080" MinWidth="1920" WindowStyle="ToolWindow" WindowState="Maximized"
d:DesignWidth="1920"
FontFamily="Microsoft YaHei"
MinHeight="1080"
MinWidth="1920" WindowStyle="None" WindowState="Maximized"
WindowStartupLocation="CenterScreen" >
<Window.Background>
<ImageBrush ImageSource="/Assets/images/background.jpg" />
@ -63,27 +65,27 @@
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="1" Height="60" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="生产计划" x:Name="FirstPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
<Button Content="设备监控" x:Name="LogPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=LogPage}" />
<Button Content="统 计" x:Name="StatisticsPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=StatisticsPage}" />
<Button Content="键 盘" x:Name="TabTip" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" x:Name="Exit" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Background="#df4642" BorderBrush="#df4642" />
<Button Content="生产计划" x:Name="FirstPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
<Button Content="设备监控" x:Name="LogPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=LogPage}" />
<Button Content="统 计" x:Name="StatisticsPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=StatisticsPage}" />
<Button Content="键 盘" x:Name="TabTip" FontSize="20" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" FontSize="20" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" x:Name="Exit" FontSize="20" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Background="#df4642" BorderBrush="#df4642" />
</StackPanel>
<StackPanel Grid.Row="2" Height="50" Margin="5 0" Orientation="Horizontal" HorizontalAlignment="Right">
<TextBlock x:Name="BeforPLcState" Text="箱壳PLC" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
<TextBlock x:Name="BeforPLcState" Text="箱壳PLC" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush x:Name="BeforPLcStateColor" ImageSource="/Assets/Images/Green.png"/>
</Border.Background>
</Border>
<TextBlock x:Name="AfterPlcState" Text="后板PLC" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
<TextBlock x:Name="AfterPlcState" Text="后板PLC" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush x:Name="AfterPlcStateColor" ImageSource="/Assets/Images/Green.png"/>
</Border.Background>
</Border>
<TextBlock x:Name="DB" Text="数据库" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
<TextBlock x:Name="DB" Text="数据库" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15" >
<Border.Background>
<ImageBrush x:Name="PlcStatusImage" ImageSource="/Assets/Images/Green.png"/>

2
Aucma.Core.SheetMetal/Views/MaterialStatisticsView.xaml
Unescape Escape View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views"
mc:Ignorable="d" Background="#1152AC"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
Title="物料库存统计" Height="650" Width="1000" Name="window" WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Topmost="True">
<Window.Resources>

10
Aucma.Core.SheetMetal/Views/QuantityIssuedView.xaml
Unescape Escape View File

@ -4,9 +4,13 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views"
mc:Ignorable="d" Background="#1152AC"
Title="下达数量" Height="500" Width="700" Name="window"
ResizeMode="NoResize" Topmost="True">
mc:Ignorable="d"
Background="#1152AC"
FontFamily="Microsoft YaHei"
Title="下达数量"
Height="500" Width="700" Name="window"
ResizeMode="NoResize"
Topmost="True">
<Border Margin="5" BorderBrush="#0288d1" CornerRadius="10">
<Border.Effect>

1
Aucma.Core.SheetMetal/Views/SearchCriteriaView.xaml
Unescape Escape View File

@ -9,6 +9,7 @@
Background="#1152AC" Height="350" Width="600" WindowStartupLocation="CenterScreen"
d:DesignHeight="350"
d:DesignWidth="600"
FontFamily="Microsoft YaHei"
ResizeMode="NoResize" Topmost="True">
<Window.Resources>
<Style x:Key="CustomTextBoxStyle" TargetType="TextBox">

20
Aucma.Core.SheetMetal/Views/SplitPlanView.xaml
Unescape Escape View File

@ -6,7 +6,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
Background="#1152AC"
Title="计划维护" FontFamily="Microsoft YaHei" Height="700" Width="900"
Title="计划维护" FontFamily="Microsoft YaHei" Height="800" Width="1000"
d:DesignHeight="800" WindowStartupLocation="CenterScreen"
d:DesignWidth="1500" ResizeMode="NoResize" Topmost="True" >
@ -161,23 +161,23 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Margin="1,0,5,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.1*"/>
<RowDefinition Height="0.15*"/>
<RowDefinition Height="0.3*"/>
<RowDefinition/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" Margin="5" VerticalAlignment="Center">
<Label Content="查询条件" VerticalAlignment="Center" Foreground="White" FontSize="18" />
<TextBox x:Name="queryParam" PreviewMouseDoubleClick="queryParam_PreviewMouseDoubleClick" Text="{Binding Search,Mode=TwoWay}" Style="{x:Null}" Width="300" HorizontalAlignment="Left" VerticalContentAlignment="Center" Margin="10 0 5 0"/>
<Button Content="查 询" Command="{Binding QueryPlanCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" Margin="5 0" />
<Button Content="重 置" Command="{Binding ResetCommand}" Margin="5 0" />
<Button Content="配 置" Command="{Binding SearchCriteriaSetCommand}" Margin="5 0" />
<Button Content="查 询" Command="{Binding QueryPlanCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" Margin="5 0" Height="40" FontSize="18" />
<Button Content="重 置" Command="{Binding ResetCommand}" Margin="5 0" Height="40" FontSize="18" />
<Button Content="配 置" Command="{Binding SearchCriteriaSetCommand}" Margin="5 0" Height="40" FontSize="18" />
</WrapPanel>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1.5*"/>
<RowDefinition Height="1.5*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0 0 0 1">
<Grid>
@ -188,7 +188,7 @@
<StackPanel Grid.Column="0" VerticalAlignment="Center" Margin="10 0 0 0">
<TextBlock Text="快捷查询" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="18" />
</StackPanel>
<WrapPanel Grid.Column="1" VerticalAlignment="Center" Margin="0 5">
<WrapPanel Grid.Column="1" VerticalAlignment="Center" Margin="5 5">
<ItemsControl ItemsSource="{Binding Configurations}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@ -202,7 +202,7 @@
Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"
GroupName="MaterialTypeRadioButton"
Margin="25,0" FontSize="12" Foreground="#FFFFFF"/>
Margin="25,0" FontSize="18" Foreground="#FFFFFF"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@ -224,7 +224,7 @@
<UniformGrid Grid.Row="2" Margin="5" >
<DataGrid ItemsSource="{Binding MaterialDataGrid}" Background="Transparent"
ColumnHeaderHeight="35" x:Name="dgvMH" FontSize="18"
ColumnHeaderHeight="40" x:Name="dgvMH" FontSize="18"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" VerticalAlignment="Stretch"
ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible"

4
Aucma.Core.SheetMetal/Views/StatisticsPageView.xaml
Unescape Escape View File

@ -93,7 +93,7 @@
<WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="18" VerticalAlignment="Center"/>
<DatePicker
x:Name="BeginTime"
x:Name="BeginTime" FontSize="16"
Width="200" Margin="10 0" BorderBrush="White"
materialDesign:CalendarAssist.IsHeaderVisible="False">
<DatePicker.SelectedDate>
@ -109,7 +109,7 @@
<TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="18" VerticalAlignment="Center"/>
<DatePicker
x:Name="EndTime" Margin="10 0"
Width="200" BorderBrush="White"
Width="200" BorderBrush="White" FontSize="16"
materialDesign:CalendarAssist.IsHeaderVisible="False">
<DatePicker.SelectedDate>
<Binding

Write Preview
Loading…
Cancel
Save