change-改版前提交

master
liuwf 5 months ago
parent 160f46263c
commit a05f3f0bc4

@ -102,8 +102,7 @@ namespace SlnMesnac.Business
else else
{ {
//校验成功下发放行 //校验成功下发放行
WarningAndStop($"Logo识别失败禁止放行"); WarningAndStop($"Logo识别失败禁止放行");
} }
// 3.查询mes获取箱体信息 // 3.查询mes获取箱体信息
@ -123,7 +122,7 @@ namespace SlnMesnac.Business
#endregion #endregion
// TODO , 传入照片 // TODO , 传入照片
byte[] ImageData = null ; byte[] ImageData = null ;
// 刷新界面、刷新图片 // 刷新界面、刷新图片,照片按照日期存储本地
RefreshBoxInfoEvent?.Invoke(materialCodeStr, DateTime.Now.ToString(),productName,ImageData,flag); RefreshBoxInfoEvent?.Invoke(materialCodeStr, DateTime.Now.ToString(),productName,ImageData,flag);
} }

@ -30,7 +30,7 @@
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="LOGO视觉系统" FontSize="50" Foreground="White" FontWeight="Bold"/> <TextBlock Text="夏普PCI视觉检测系统" FontSize="50" Foreground="White" FontWeight="Bold"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right"> <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
@ -56,6 +56,7 @@
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal"> <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
<Button Content="首 页" x:Name="Index" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/> <Button Content="首 页" x:Name="Index" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="校验记录" x:Name="List" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=List}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/> <Button Content="校验记录" x:Name="List" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=List}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="检测配置" x:Name="Config" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Config}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
<Button Content="键 盘" Visibility="Collapsed" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/> <Button Content="键 盘" Visibility="Collapsed" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="35" 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="35" Background="#FF9900" BorderBrush="#FF9900" 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="35" 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="35" Background="#FF0033" BorderBrush="#FF0033" 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="35" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>

Loading…
Cancel
Save