diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 287c76c..0dc1d0a 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -10,6 +10,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Data; +using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder; using System.Diagnostics; using System.Linq; using System.Net; @@ -53,6 +54,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass drEmployee["State"] = "801"; drEmployee.EndEdit(); drEmployee.AcceptChanges(); + LogGing.LogGingDATA("[IP='" + client.IP + "' AND port='" + client.Port + "']=Link_OK"); } catch (Exception ex) @@ -385,15 +387,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass .SetMinBufferSize(1024*64) .SetRemoteIPHost(ip + ":" + port) .ConfigurePlugins(a => - { - a.UseCheckClear() - .SetCheckClearType(CheckClearType.All) - .SetTick(TimeSpan.FromSeconds(5)) - .SetOnClose((c, t) => - { - c.TryShutdown(); - }); - // a.UseTcpReconnection();//触发型重连 + { + // a.UseTcpReconnection();//触发型重连 }) .ConfigureContainer(a => { diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index b5a909e..b144c29 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -376,6 +376,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View dat_821.Add("P4", P4); dat_821.Add("P5", P5); + DataRow row = MainWindowViewModel.dt_TP.Select("Step='" + ID + "'").First(); + row.BeginEdit(); + row["RUN"] = 2; + row.EndEdit(); + row.AcceptChanges(); + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); int index = Convert.ToInt16(drEmployee.Field("ID")); MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index c986575..b8180e2 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -329,7 +329,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel stringQueue.Enqueue(new QueueString { ID = i, - DAT = "SC800:SCCM[" + MachiensTcpClient[i].IP + ";" + MachiensTcpClient[i].Port + "]" + DAT = "SC800:SCCM[" + Selet_Machines(Machines, "IP", "ID='" + i + "'") + ";" + + Selet_Machines(Machines, "Prot", "ID='" + i + "'") + "]" });//信息插入队列 }