liulb@mesnac.com 1 year ago
parent 0e14361391
commit d0915af48a

@ -26,13 +26,14 @@
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#0288d1" /> <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#0288d1" />
<!--字体大小设置--> <!--字体大小设置-->
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="FontWeight" Value="Bold"/> <!--<Setter Property="FontWeight" Value="Bold"/>-->
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style> </Style>
<Style TargetType="TextBox"> <!--<Style TargetType="TextBox">
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="18"/>
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
</Style> </Style>-->
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>

@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d" Background="#1152AC" mc:Ignorable="d" Background="#1152AC"
Title="库存设置" Height="500" Width="700" Name="window" Title="库存设置" Height="600" Width="800" Name="window"
ResizeMode="NoResize" Topmost="True"> ResizeMode="NoResize" Topmost="True">
<Border Margin="5" BorderBrush="#0288d1" CornerRadius="10"> <Border Margin="5" BorderBrush="#0288d1" CornerRadius="10">
@ -45,7 +45,7 @@
<TextBlock Text="多货道" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="多货道" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<ComboBox Width="150" Height="30" Margin="10 0 0 0" <ComboBox Width="150" Height="30" Margin="10 0 0 0"
Style="{x:Null}" Background="#1152AC" VerticalAlignment="Center" FontSize="15" Style="{x:Null}" Background="#1152AC" VerticalAlignment="Center" FontSize="15" Foreground="Black"
SelectedItem="{Binding SelectLocation,Mode=TwoWay}" SelectedItem="{Binding SelectLocation,Mode=TwoWay}"
SelectedValuePath="SelectedModel" SelectedValuePath="SelectedModel"
DisplayMemberPath="TypeName" DisplayMemberPath="TypeName"

@ -28,6 +28,7 @@
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="FontSize" Value="20"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style> </Style>

@ -12,7 +12,8 @@
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<!--<Setter Property="Height" Value="40"/>--> <!--<Setter Property="Height" Value="40"/>-->
<Setter Property="FontSize" Value="16"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Left" />
</Style> </Style>
<Style TargetType="DataGrid"> <Style TargetType="DataGrid">
@ -42,7 +43,7 @@
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#dddddd" /> <Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="50"/> <Setter Property="Height" Value="50"/>
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="Background" Value="#4285DE"/> <Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/> <Setter Property="Foreground" Value="White"/>
</Style> </Style>
@ -58,7 +59,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}"> <ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" > <Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" /> <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@ -172,7 +173,7 @@
HorizontalAlignment="Left" 不显示多余的空白列; HorizontalAlignment="Left" 不显示多余的空白列;
--> -->
<DataGrid x:Name="dgvMH" Height="{Binding Path=ActualHeight, ElementName=HeightPanel}" <DataGrid x:Name="dgvMH" Height="{Binding Path=ActualHeight, ElementName=HeightPanel}"
HorizontalAlignment="Center" VerticalAlignment="Top" AlternationCount="2" RowHeaderWidth="0" HorizontalAlignment="Left" VerticalAlignment="Top" AlternationCount="2" RowHeaderWidth="0"
ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single"
SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}"> SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
<DataGrid.Columns> <DataGrid.Columns>
@ -180,12 +181,13 @@
<DataGridTextColumn Width="1*" Binding="{Binding OrderCode}" Header="订单编号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="1*" Binding="{Binding OrderCode}" Header="订单编号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1*" Binding="{Binding ProductCode}" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="1*" Binding="{Binding ProductCode}" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="2*" Binding="{Binding MaterialName}" Header="产品型号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="2*" Binding="{Binding MaterialName}" Header="产品型号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding LinerAmount}" Header="内胆码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding BoxAmount}" Header="箱体码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PlanAmount}" Header="订单数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="*" Binding="{Binding PlanAmount}" Header="订单数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding ErrorNum}" Header="异常量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding LinerAmount}" Header="内胆编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding BoxAmount}" Header="箱体编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PrintLinerAmount}" Header="内胆码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="*" Binding="{Binding PrintLinerAmount}" Header="内胆码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PrintBoxAmount}" Header="箱壳码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Width="*" Binding="{Binding PrintBoxAmount}" Header="箱体码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding ErrorNum}" Header="异常量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding CompleteAmount}" Header="剩余" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" /> <DataGridTextColumn Width="*" Binding="{Binding CompleteAmount}" Header="剩余" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
@ -246,7 +248,7 @@
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/> IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button <Button
Background="#4285DE" Background="#4285DE"
Content="追" Margin="10 10 0 0" Width="100" Command="{Binding AppendPrintPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}" 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}}"/> IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button <Button
Background="#4285DE" Background="#4285DE"

@ -31,12 +31,13 @@
<ImageBrush Stretch="Fill" ImageSource="/Assets/Images/headbg.png" /> <ImageBrush Stretch="Fill" ImageSource="/Assets/Images/headbg.png" />
</StackPanel.Background> </StackPanel.Background>
<StackPanel HorizontalAlignment="Center" Margin="0 3 0 0" > <StackPanel HorizontalAlignment="Center" Margin="0 3 0 0" >
<TextBlock Text="澳柯玛条码打印系统" Margin="0" Foreground="White" FontSize="45" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="澳柯玛MES条码打印系统" Margin="0" Foreground="White" FontSize="42" HorizontalAlignment="Center" VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<WrapPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -30 20 0"> <WrapPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -30 20 0">
<TextBlock x:Name="TestTB" Text="白班" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/> <!--<TextBlock x:Name="TestTB" Text="白班" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/>
<TextBlock Text="|" VerticalAlignment="Center" Foreground="White" FontSize="15" /> <TextBlock Text="|" VerticalAlignment="Center" Foreground="White" FontSize="15" />
<TextBlock x:Name="loginUser" Text="李四" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/> <TextBlock x:Name="loginUser" Text="李四" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/>-->
</WrapPanel> </WrapPanel>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>

Loading…
Cancel
Save