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

change-界面修改

Browse Source
main
liuwf 11 months ago
parent 2aae5fb0e6
commit a66828ce4f
11 changed files with 183 additions and 166 deletions
Show Stats Download Patch File Download Diff File

155
Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -67,74 +67,71 @@ namespace Aucma.Core.CodeBinding.ViewModels
TouchSocketService.RefreshStateEvent += RefreshScanner; TouchSocketService.RefreshStateEvent += RefreshScanner;
GunBusiness.InstanceSerialPort3(); GunBusiness.InstanceSerialPort3();
updatePlcState(); init();
// InitHikRobot();
}
private void updatePlcState()
{
Task.Run(() =>
{
Thread.Sleep(4000);
var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
if (obj.plc.IsConnected)
{
PlcState(true);
}
else
{
PlcState(false);
}
});
}
#region 开启海康扫码器
public void InitHikRobot()
{
try
{
Task.Run(() =>
{
Thread.Sleep(2000);
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) #region 初始化班组刷新定时任务
public void init()
{ {
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()
Business.MvCodeHelper.Liner(); //{
}); // try
// {
} // Task.Run(() =>
catch (Exception ex) // {
{ // Thread.Sleep(2000);
log.Error("InitHikRobot()开启海康扫码器和扫码枪方法异常" + ex.Message.ToString());
//MvCodeHelper.CloseAllDevice();
//InitHikRobot(); // 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);
// }
// Business.MvCodeHelper.Liner();
// });
// }
// catch (Exception ex)
// {
// log.Error("InitHikRobot()开启海康扫码器和扫码枪方法异常" + ex.Message.ToString());
// //MvCodeHelper.CloseAllDevice();
// //InitHikRobot();
// }
//}
#endregion #endregion
@ -156,28 +153,26 @@ namespace Aucma.Core.CodeBinding.ViewModels
/// <summary> /// <summary>
/// 设备状态刷新 /// 设备状态刷新
/// </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); MesDbState(true);
// Scanner1State(scanner1); RefreshPlc();
// Scanner2State(scanner2);
return Task.CompletedTask;
} }
/// <summary>
/// 扫码器状态刷新 // 刷新plc状态
/// </summary> public void RefreshPlc()
/// <param name="sender"></param> {
/// <param name="e"></param> var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
public void RefreshScanner() if (obj.plc.IsConnected)
{ {
string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip"); PlcState(true);
string ip2 = Appsettings.app("Middleware", "Scanner2", "Ip"); }
// bool flag1 = MvCodeHelper.ConnectionStatus(ip1); else
// bool flag2 = MvCodeHelper.ConnectionStatus(ip2); {
Scanner1State(true); PlcState(false);
Scanner2State(true); }
} }
#endregion #endregion

2
Aucma.Core.CodeBinding/appsettings.json
Unescape Escape View File

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

6
Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
Unescape Escape View File

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

101
Aucma.Core.Palletiz/Views/IndexPageView.xaml
Unescape Escape View File

@ -80,7 +80,7 @@
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
</Grid.RowDefinitions> </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>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
@ -122,14 +122,23 @@
</Border> </Border>
</Grid> </Grid>
</Border> </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>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="11.5*"/> <ColumnDefinition Width="6*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="提示信息:" Foreground="White" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/> <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"/> <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> </Grid>
</Border> </Border>
<Border Grid.Row="2" BorderBrush="Blue" BorderThickness="0" Margin="0,5,0,5"> <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 x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaA_outerBorder}" Margin="5,5">
<ContentControl.Style> <ContentControl.Style>
<Style TargetType="ContentControl"> <Style TargetType="ContentControl">
<Setter Property="Height" Value="35" /> <Setter Property="Height" Value="40" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Border Background="#4D96E0" > <Border Background="#4D96E0" x:Name="borderName" >
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>--> <!--<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"> <Button Width="{Binding Path=ActualWidth, ElementName=borderName}" 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" > <WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=borderName}" >
<TextBlock Text="{Binding SpaceCode}" Foreground="White" FontSize="18" FontWeight="Bold" Margin="20 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/> <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> </Button>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -188,63 +197,23 @@
<Border Grid.Column="1" BorderBrush="Blue" BorderThickness="0" Margin="5,0,0,0"> <Border Grid.Column="1" BorderBrush="Blue" BorderThickness="0" Margin="5,0,0,0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="6*"/> <RowDefinition Height="5*"/>
<RowDefinition Height="4*"/> <RowDefinition Height="5*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,5"> <Border Grid.Row="0" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,5">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <!--<RowDefinition Height="1*"/>-->
<RowDefinition Height="5*"/> <RowDefinition Height="5*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#1254AB" BorderThickness="0" Margin="0,0,0,5">
<!--<Grid> <Border Grid.Row="0" BorderBrush="Blue" BorderThickness="0" Margin="0,0,0,0">
<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">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/> <ColumnDefinition Width="6*"/>
<!--<ColumnDefinition Width="4*"/>--> <!--<ColumnDefinition Width="4*"/>-->
</Grid.ColumnDefinitions> </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"> <Border Grid.Column="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
<ContentControl Content="{Binding InStoreTaskContent}"/> <ContentControl Content="{Binding InStoreTaskContent}"/>
</Border> </Border>
@ -263,7 +232,9 @@
<TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
--><!--日志信息--><!-- -->
<!--日志信息-->
<!--
<Border Grid.Row="1" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5"> <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"/> <ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="15" Foreground="#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
</Border> </Border>
@ -289,16 +260,26 @@
<ContentControl x:Name="ctrl" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Margin="5,5"> <ContentControl x:Name="ctrl" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Margin="5,5">
<ContentControl.Style> <ContentControl.Style>
<Style TargetType="ContentControl"> <Style TargetType="ContentControl">
<Setter Property="Width" Value="40" /> <Setter Property="Width" Value="55" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<StackPanel Background="#4D96E0" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Orientation="Vertical"> <StackPanel Background="#4D96E0" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Orientation="Vertical">
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>--> <!--<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"> <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">
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"/> <Grid>
<WrapPanel Grid.Column="0" VerticalAlignment="Top" Orientation="Vertical" Height="{Binding ActualWidth, ElementName=areaB_outerBorder}">
<StackPanel HorizontalAlignment="Left" >
<!--MaterialType--> <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> </Button>
</StackPanel> </StackPanel>
</ControlTemplate> </ControlTemplate>

6
Aucma.Core.Palletiz/appsettings.json
Unescape Escape View File

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

6
Aucma.Core.PalletizCX1/ViewModels/StatisticsPageViewModel.cs
Unescape Escape View File

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

6
Aucma.Core.PalletizCX1/Views/IndexPageView.xaml
Unescape Escape View File

@ -82,7 +82,7 @@
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
</Grid.RowDefinitions> </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>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
@ -124,7 +124,7 @@
</Border> </Border>
</Grid> </Grid>
</Border> </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>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@ -144,7 +144,7 @@
</Grid> </Grid>
</Border> </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>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>

27
Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -70,8 +70,32 @@ namespace Aucma.Core.ProductOffLine.ViewModels
// Job_AllState_Quartz.RefreshStateEvent += RefreshStatus; // Job_AllState_Quartz.RefreshStateEvent += RefreshStatus;
InitHikRobotAndGun(); 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通信 #region 开启海康扫码器和扫码枪--扫码器改用TCP通信
public void InitHikRobotAndGun() public void InitHikRobotAndGun()
{ {
@ -135,8 +159,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
{ {
MesDbState(mesState); MesDbState(mesState);
PlcState(plcState); PlcState(plcState);
Scanner1State(scanner1);
Scanner2State(scanner2);
return Task.CompletedTask; return Task.CompletedTask;
} }

24
Aucma.Core.ProductOffLineCX1/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -69,9 +69,33 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
// Job_AllState_Quartz.RefreshStateEvent += RefreshStatus; // Job_AllState_Quartz.RefreshStateEvent += RefreshStatus;
InitHikRobotAndGun(); 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通信 #region 开启海康扫码器和扫码枪--扫码器改用TCP通信
public void InitHikRobotAndGun() public void InitHikRobotAndGun()
{ {

8
Aucma.Core.ProductOffLineCX1/appsettings.json
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save