|
|
|
@ -80,7 +80,7 @@
|
|
|
|
|
<RowDefinition Height="1*"/>
|
|
|
|
|
<RowDefinition Height="10*"/>
|
|
|
|
|
</Grid.RowDefinitions>
|
|
|
|
|
<Border Grid.Row="0" BorderBrush="Blue" BorderThickness="2" Margin="0,5,0,5">
|
|
|
|
|
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="1" Margin="0,5,0,5">
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
|
<ColumnDefinition Width="1*"/>
|
|
|
|
@ -122,14 +122,23 @@
|
|
|
|
|
</Border>
|
|
|
|
|
</Grid>
|
|
|
|
|
</Border>
|
|
|
|
|
<Border Grid.Row="1" BorderBrush="Blue" BorderThickness="2" Margin="0,5,0,5">
|
|
|
|
|
<Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Margin="0,5,0,5">
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
|
<ColumnDefinition Width="11.5*"/>
|
|
|
|
|
<ColumnDefinition Width="6*"/>
|
|
|
|
|
<ColumnDefinition Width="3*"/>
|
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
<TextBlock Grid.Column="0" Text="提示信息:" Foreground="White" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
|
|
|
|
<TextBlock Grid.Column="1" Text="{Binding Msg}" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
|
|
|
|
|
<Grid Grid.Column="2">
|
|
|
|
|
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal" Margin="10,0,30,0">
|
|
|
|
|
<Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
|
|
|
|
|
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
|
|
|
|
|
<Button Content="{Binding InStoreAmount}" FontSize="18" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="Transparent" Margin="0,0,10,0"/>
|
|
|
|
|
</StackPanel>
|
|
|
|
|
|
|
|
|
|
</Grid>
|
|
|
|
|
</Grid>
|
|
|
|
|
</Border>
|
|
|
|
|
<Border Grid.Row="2" BorderBrush="Blue" BorderThickness="0" Margin="0,5,0,5">
|
|
|
|
@ -153,21 +162,21 @@
|
|
|
|
|
<ContentControl x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaA_outerBorder}" Margin="5,5">
|
|
|
|
|
<ContentControl.Style>
|
|
|
|
|
<Style TargetType="ContentControl">
|
|
|
|
|
<Setter Property="Height" Value="35" />
|
|
|
|
|
<Setter Property="Height" Value="40" />
|
|
|
|
|
<Setter Property="Template">
|
|
|
|
|
<Setter.Value>
|
|
|
|
|
<ControlTemplate>
|
|
|
|
|
<Border Background="#4D96E0" >
|
|
|
|
|
<Border Background="#4D96E0" x:Name="borderName" >
|
|
|
|
|
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
|
|
|
|
<Button VerticalAlignment="Center" HorizontalAlignment="Left" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
|
|
|
|
|
<Grid>
|
|
|
|
|
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
|
|
|
|
|
<TextBlock Text="{Binding SpaceCode}" Foreground="White" FontSize="18" FontWeight="Bold" Margin="20 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
|
|
|
|
<Button Width="{Binding Path=ActualWidth, ElementName=borderName}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
|
|
|
|
|
|
|
|
|
|
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=borderName}" >
|
|
|
|
|
<TextBlock Text="{Binding SpaceCode, StringFormat='A{0}'}" Width="100" Foreground="White" FontSize="18" FontWeight="Bold" Margin="0 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
|
|
|
|
|
|
|
|
|
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" />
|
|
|
|
|
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" />
|
|
|
|
|
|
|
|
|
|
</WrapPanel>
|
|
|
|
|
|
|
|
|
|
</WrapPanel>
|
|
|
|
|
</Grid>
|
|
|
|
|
</Button>
|
|
|
|
|
</Border>
|
|
|
|
|
</ControlTemplate>
|
|
|
|
@ -188,63 +197,23 @@
|
|
|
|
|
<Border Grid.Column="1" BorderBrush="Blue" BorderThickness="0" Margin="5,0,0,0">
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.RowDefinitions>
|
|
|
|
|
<RowDefinition Height="6*"/>
|
|
|
|
|
<RowDefinition Height="4*"/>
|
|
|
|
|
<RowDefinition Height="5*"/>
|
|
|
|
|
<RowDefinition Height="5*"/>
|
|
|
|
|
</Grid.RowDefinitions>
|
|
|
|
|
<Border Grid.Row="0" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,5">
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.RowDefinitions>
|
|
|
|
|
<RowDefinition Height="1*"/>
|
|
|
|
|
<!--<RowDefinition Height="1*"/>-->
|
|
|
|
|
<RowDefinition Height="5*"/>
|
|
|
|
|
</Grid.RowDefinitions>
|
|
|
|
|
<Border Grid.Row="0" BorderBrush="#1254AB" BorderThickness="0" Margin="0,0,0,5">
|
|
|
|
|
|
|
|
|
|
<!--<Grid>
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
|
<ColumnDefinition/>
|
|
|
|
|
<ColumnDefinition/>
|
|
|
|
|
<ColumnDefinition/>
|
|
|
|
|
<ColumnDefinition/>
|
|
|
|
|
<ColumnDefinition/>
|
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
<StackPanel Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
|
|
|
<Label Content="A区扫码成功" FontSize="20" Foreground="Green"/>
|
|
|
|
|
</StackPanel>
|
|
|
|
|
<StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
|
|
|
<Label Content="B区扫码失败" FontSize="20" Foreground="Red" />
|
|
|
|
|
</StackPanel>
|
|
|
|
|
<Border Grid.Column="2" >
|
|
|
|
|
<Button Content="异常入库" FontSize="16" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" />
|
|
|
|
|
</Border>
|
|
|
|
|
</Grid>-->
|
|
|
|
|
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,0,0,0">
|
|
|
|
|
<Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
|
|
|
|
|
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
|
|
|
|
|
<Button Content="{Binding InStoreAmount}" FontSize="18" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="Transparent" Margin="0,0,10,0"/>
|
|
|
|
|
</StackPanel>
|
|
|
|
|
</Border>
|
|
|
|
|
<Border Grid.Row="1" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,0">
|
|
|
|
|
<Border Grid.Row="0" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,0">
|
|
|
|
|
<Grid>
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
|
<ColumnDefinition Width="6*"/>
|
|
|
|
|
<!--<ColumnDefinition Width="4*"/>-->
|
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
<!--<DataGrid Grid.Column="0" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent"
|
|
|
|
|
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="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
|
|
|
|
|
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
|
|
|
|
|
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
|
|
|
|
|
<DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
|
|
|
|
|
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="扫描时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
|
|
|
|
|
|
|
|
|
|
</DataGrid.Columns>
|
|
|
|
|
</DataGrid>-->
|
|
|
|
|
<Border Grid.Column="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
|
|
|
|
|
<ContentControl Content="{Binding InStoreTaskContent}"/>
|
|
|
|
|
</Border>
|
|
|
|
@ -263,7 +232,9 @@
|
|
|
|
|
<TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
|
|
|
|
</Border>
|
|
|
|
|
|
|
|
|
|
--><!--日志信息--><!--
|
|
|
|
|
-->
|
|
|
|
|
<!--日志信息-->
|
|
|
|
|
<!--
|
|
|
|
|
<Border Grid.Row="1" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
|
|
|
|
|
<ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="15" Foreground="#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
|
|
|
|
|
</Border>
|
|
|
|
@ -289,16 +260,26 @@
|
|
|
|
|
<ContentControl x:Name="ctrl" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Margin="5,5">
|
|
|
|
|
<ContentControl.Style>
|
|
|
|
|
<Style TargetType="ContentControl">
|
|
|
|
|
<Setter Property="Width" Value="40" />
|
|
|
|
|
<Setter Property="Width" Value="55" />
|
|
|
|
|
<Setter Property="Template">
|
|
|
|
|
<Setter.Value>
|
|
|
|
|
<ControlTemplate>
|
|
|
|
|
<StackPanel Background="#4D96E0" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Orientation="Vertical">
|
|
|
|
|
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
|
|
|
|
<Button Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
|
|
|
|
|
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"/>
|
|
|
|
|
|
|
|
|
|
<!--MaterialType-->
|
|
|
|
|
<Button VerticalAlignment="Top" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" HorizontalAlignment="Center" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
|
|
|
|
|
<Grid>
|
|
|
|
|
<WrapPanel Grid.Column="0" VerticalAlignment="Top" Orientation="Vertical" Height="{Binding ActualWidth, ElementName=areaB_outerBorder}">
|
|
|
|
|
<StackPanel HorizontalAlignment="Left" >
|
|
|
|
|
|
|
|
|
|
<TextBlock Text="{Binding SpaceCode, StringFormat='B{0}'}" Foreground="White" FontSize="18" FontWeight="Bold" />
|
|
|
|
|
</StackPanel>
|
|
|
|
|
<WrapPanel Width="35" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Orientation="Vertical">
|
|
|
|
|
<!--<TextBlock Text="BC/BD-100T" Foreground="White" FontSize="18" FontWeight="Bold" Width="50" Height="200" Background="Red"/>-->
|
|
|
|
|
<TextBlock Text="{Binding typeNameA}" Width="25" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap">
|
|
|
|
|
</TextBlock>
|
|
|
|
|
</WrapPanel>
|
|
|
|
|
</WrapPanel>
|
|
|
|
|
</Grid>
|
|
|
|
|
</Button>
|
|
|
|
|
</StackPanel>
|
|
|
|
|
</ControlTemplate>
|
|
|
|
|