Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
a103fde2b5
1 file changed
+8
-8
@@ -88,7 +88,7 @@ namespace DyeingComputer.UserClass
|
|||||||
Chart_new.Add("GROUP", MainWindowViewModel.S05);
|
Chart_new.Add("GROUP", MainWindowViewModel.S05);
|
||||||
Chart_new.Add("SYSKEY", MainWindowViewModel.SYSKEY);
|
Chart_new.Add("SYSKEY", MainWindowViewModel.SYSKEY);
|
||||||
Chart_new.Add("TIME", MainWindowViewModel.SYSTime);
|
Chart_new.Add("TIME", MainWindowViewModel.SYSTime);
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
client.SendAsync("[" + MainWindowViewModel.S01 + "]" +"SC800"+ Chart_new.ToJsonString());
|
||||||
}
|
}
|
||||||
else if (SYSAPI == "SC810")
|
else if (SYSAPI == "SC810")
|
||||||
{
|
{
|
||||||
@@ -151,7 +151,7 @@ namespace DyeingComputer.UserClass
|
|||||||
if (DateTime.TryParse(SYSDAT, out dt))
|
if (DateTime.TryParse(SYSDAT, out dt))
|
||||||
SetLocalDateTime(dt);
|
SetLocalDateTime(dt);
|
||||||
}
|
}
|
||||||
client.SendAsync("[" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + "]");
|
client.SendAsync("SC820" + "[" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + "]");
|
||||||
}
|
}
|
||||||
catch { client.SendAsync("SC920"); }
|
catch { client.SendAsync("SC920"); }
|
||||||
}
|
}
|
||||||
@@ -214,7 +214,7 @@ namespace DyeingComputer.UserClass
|
|||||||
Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
|
Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
|
||||||
Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
|
Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
|
||||||
Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
|
Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
client.SendAsync("SC830" + "[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//当前信息
|
}//当前信息
|
||||||
@@ -223,7 +223,7 @@ namespace DyeingComputer.UserClass
|
|||||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||||
{
|
{
|
||||||
|
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" +TechnologicalProcessView.sql.Tables[0].ToJsonString());
|
client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" +TechnologicalProcessView.sql.Tables[0].ToJsonString());
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//当前工作表
|
}//当前工作表
|
||||||
@@ -232,7 +232,7 @@ namespace DyeingComputer.UserClass
|
|||||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||||
{
|
{
|
||||||
|
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.SYSlog);
|
client.SendAsync("SC832" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.SYSlog);
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//当前细节信息
|
}//当前细节信息
|
||||||
@@ -240,7 +240,7 @@ namespace DyeingComputer.UserClass
|
|||||||
{
|
{
|
||||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||||
{
|
{
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_d.ToJsonString());//数字开关信息
|
client.SendAsync("SC851" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_d.ToJsonString());//数字开关信息
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//数字开关表
|
}//数字开关表
|
||||||
@@ -248,7 +248,7 @@ namespace DyeingComputer.UserClass
|
|||||||
{
|
{
|
||||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||||
{
|
{
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_a.ToJsonString());//寄存器信息
|
client.SendAsync("SC852" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_a.ToJsonString());//寄存器信息
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//寄存器表
|
}//寄存器表
|
||||||
@@ -256,7 +256,7 @@ namespace DyeingComputer.UserClass
|
|||||||
{
|
{
|
||||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||||
{
|
{
|
||||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_m.ToJsonString());//缓存信息
|
client.SendAsync("SC853" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_m.ToJsonString());//缓存信息
|
||||||
}
|
}
|
||||||
else { client.SendAsync("SC999"); }
|
else { client.SendAsync("SC999"); }
|
||||||
}//缓存表
|
}//缓存表
|
||||||
|
|||||||
Reference in new issue
Block a user