change-界面修改

main
liuwf 11 months ago
parent 2aae5fb0e6
commit a66828ce4f

@ -67,74 +67,71 @@ namespace Aucma.Core.CodeBinding.ViewModels
TouchSocketService.RefreshStateEvent += RefreshScanner;
GunBusiness.InstanceSerialPort3();
updatePlcState();
// InitHikRobot();
init();
}
private void updatePlcState()
#region 初始化班组刷新定时任务
public void init()
{
Task.Run(() =>
{
Thread.Sleep(4000);
var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
if (obj.plc.IsConnected)
{
PlcState(true);
}
else
{
PlcState(false);
}
});
// 设备状态刷新定时器
System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
timer.AutoReset = true;
timer.Enabled = true;
timer.Start();
}
#endregion
#region 开启海康扫码器
public void InitHikRobot()
{
try
{
Task.Run(() =>
{
Thread.Sleep(2000);
//public void InitHikRobot()
//{
// try
// {
// Task.Run(() =>
// {
// Thread.Sleep(2000);
Business.MvCodeHelper.Shell();
// Business.MvCodeHelper.Shell();
});
Task.Run(() =>
{
Thread.Sleep(4000);
try
{
var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
if (obj != null)
{
PlcState(true);
}
else
{
PlcState(false);
}
}catch (Exception ex)
{
PlcState(false);
}
// });
// Task.Run(() =>
// {
// Thread.Sleep(4000);
// try
// {
// var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
// if (obj != null)
// {
// PlcState(true);
// }
// else
// {
// PlcState(false);
// }
// }catch (Exception ex)
// {
// PlcState(false);
// }
Business.MvCodeHelper.Liner();
});
}
catch (Exception ex)
{
log.Error("InitHikRobot()开启海康扫码器和扫码枪方法异常" + ex.Message.ToString());
//MvCodeHelper.CloseAllDevice();
//InitHikRobot();
}
}
// Business.MvCodeHelper.Liner();
// });
// }
// catch (Exception ex)
// {
// log.Error("InitHikRobot()开启海康扫码器和扫码枪方法异常" + ex.Message.ToString());
// //MvCodeHelper.CloseAllDevice();
// //InitHikRobot();
// }
//}
#endregion
@ -156,31 +153,29 @@ namespace Aucma.Core.CodeBinding.ViewModels
/// <summary>
/// 设备状态刷新
/// </summary>
public Task RefreshStatus(bool mesState,bool plcState,bool scanner1,bool scanner2)
public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
{
MesDbState(mesState);
PlcState(plcState);
// Scanner1State(scanner1);
// Scanner2State(scanner2);
return Task.CompletedTask;
MesDbState(true);
RefreshPlc();
}
/// <summary>
/// 扫码器状态刷新
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
public void RefreshScanner()
// 刷新plc状态
public void RefreshPlc()
{
string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
string ip2 = Appsettings.app("Middleware", "Scanner2", "Ip");
// bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
// bool flag2 = MvCodeHelper.ConnectionStatus(ip2);
Scanner1State(true);
Scanner2State(true);
var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
if (obj.plc.IsConnected)
{
PlcState(true);
}
else
{
PlcState(false);
}
}
#endregion
#region 更换界面

@ -223,8 +223,8 @@
"EquipName": "条码绑定Plc",
"PlcType": "Melsec",
"Enabled": true,
//"IP": "127.0.0.1",
// "Port": 6000
// "IP": "127.0.0.1",
// "Port": 6000
"IP": "10.10.92.70",
"Port": 2014
},

@ -51,11 +51,7 @@ namespace Aucma.Core.Palletiz.ViewModels
/// <returns></returns>
public void AddData(RecordInStore record)
{
App.Current.Dispatcher.Invoke(() =>
{
MaterialDataGrid.Add(record);
CountInstoreEvent?.Invoke(MaterialDataGrid.Count);
});
LoadData();
}
#region 加载DataGrid数据

@ -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>

@ -194,8 +194,10 @@
"EquipName": "InStoreAPlc",
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.80", //10.10.92.80
"Port": 2014
// "IP": "127.0.0.1",
// "Port": 6000
"IP": "10.10.92.80", //10.10.92.80
"Port": 2014
},
{
"Id": 2,
@ -207,10 +209,10 @@
}
],
"StationInfo": {
"StationCode": "1010"
"StationCode": "101011"
},
"StoreInfo": {
"StationCode": "1010",
"StationCode": "101011",
"StationName": "成品分垛库",
"PalletizStoreCodeA": "FDK-001",
"PalletizStoreCodeB": "FDK-002",

@ -51,11 +51,7 @@ namespace Aucma.Core.PalletizCX1.ViewModels
/// <returns></returns>
public void AddData(RecordInStore record)
{
App.Current.Dispatcher.Invoke(() =>
{
MaterialDataGrid.Add(record);
CountInstoreEvent?.Invoke(MaterialDataGrid.Count);
});
LoadData();
}
#region 加载DataGrid数据

@ -82,7 +82,7 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="LightBlue" BorderThickness="1" Margin="0,5,0,5">
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="1" Margin="0,5,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@ -124,7 +124,7 @@
</Border>
</Grid>
</Border>
<Border Grid.Row="1" BorderBrush="LightBlue" BorderThickness="1" Margin="0,5,0,5">
<Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Margin="0,5,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@ -144,7 +144,7 @@
</Grid>
</Border>
<Border Grid.Row="2" BorderBrush="#1157b9" BorderThickness="1" Margin="0,5,0,5">
<Border Grid.Row="2" BorderBrush="Gray" BorderThickness="1" Margin="0,5,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>

@ -69,8 +69,32 @@ namespace Aucma.Core.ProductOffLine.ViewModels
// Job_AllState_Quartz.RefreshStateEvent += RefreshStatus;
InitHikRobotAndGun();
init();
}
#region 初始化班组刷新定时任务
public void init()
{
// 设备状态刷新定时器
System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
timer.AutoReset = true;
timer.Enabled = true;
timer.Start();
}
#endregion
/// <summary>
/// 设备状态刷新
/// </summary>
public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
{
MesDbState(true);
RefreshPlc();
}
#region 开启海康扫码器和扫码枪--扫码器改用TCP通信
public void InitHikRobotAndGun()
@ -135,8 +159,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
{
MesDbState(mesState);
PlcState(plcState);
Scanner1State(scanner1);
Scanner2State(scanner2);
return Task.CompletedTask;
}

@ -229,8 +229,8 @@
"EquipName": "成品下线Plc",
"PlcType": "Melsec",
"Enabled": true,
// "IP": "127.0.0.1",
// "Port": 6000
// "IP": "127.0.0.1",
// "Port": 6000
"IP": "10.10.92.70",
"Port": 2015
}

@ -69,9 +69,33 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
// Job_AllState_Quartz.RefreshStateEvent += RefreshStatus;
InitHikRobotAndGun();
init();
}
#region 初始化班组刷新定时任务
public void init()
{
// 设备状态刷新定时器
System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
timer.AutoReset = true;
timer.Enabled = true;
timer.Start();
}
#endregion
/// <summary>
/// 设备状态刷新
/// </summary>
public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
{
MesDbState(true);
RefreshPlc();
}
#region 开启海康扫码器和扫码枪--扫码器改用TCP通信
public void InitHikRobotAndGun()
{

@ -229,10 +229,10 @@
"EquipName": "成品下线Plc",
"PlcType": "Melsec",
"Enabled": true,
"IP": "127.0.0.1",
"Port": 6000
// "IP": "10.10.92.110",
// "Port": 2015
// "IP": "127.0.0.1",
// "Port": 6000
"IP": "10.10.92.110",
"Port": 2015
}
],

Loading…
Cancel
Save