sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

master
sc 12 months ago
parent
7e0e73612a 422ae271aa
commit
a103fde2b5
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      UserClass/AsyncTcpServer.cs

22
UserClass/AsyncTcpServer.cs
View File

@ -88,7 +88,7 @@ namespace DyeingComputer.UserClass
Chart_new.Add("GROUP", MainWindowViewModel.S05);
Chart_new.Add("SYSKEY", MainWindowViewModel.SYSKEY);
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")
{
@ -110,7 +110,7 @@ namespace DyeingComputer.UserClass
WorkOrder_dat.GetValue("State").ToString(),
WorkOrder_dat.GetValue("ProcessID").ToString());
if (!dat_w) { client.SendAsync("SC910"); }
else { client.SendAsync("SC810"+SYSKEY+SYSDAT); }
else { client.SendAsync("SC810" + SYSKEY +SYSDAT); }
}
catch
{
@ -151,7 +151,7 @@ namespace DyeingComputer.UserClass
if (DateTime.TryParse(SYSDAT, out 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"); }
}
@ -185,8 +185,8 @@ namespace DyeingComputer.UserClass
else if (dat_821.GetValue("INSTRUCTION").ToString() == "JUMP")
{
MainWindowViewModel.RUN_DATATABLE = TechnologicalProcessView.sql.Tables[0];//缓存表
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(dat_821.GetValue("ID").ToString());//插入步骤号
MainWindowViewModel.STEP_START(dat_821.GetValue("Numder").ToString(), Convert.ToDouble(dat_821.GetValue("P1")),
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(dat_821.GetValue("ID").ToString());//插入步骤号
MainWindowViewModel.STEP_START(dat_821.GetValue("Numder").ToString(), Convert.ToDouble(dat_821.GetValue("P1")),
Convert.ToDouble(dat_821.GetValue("P2")), Convert.ToDouble(dat_821.GetValue("P3")),
Convert.ToDouble(dat_821.GetValue("P4")), Convert.ToDouble(dat_821.GetValue("P5")));
}
@ -214,7 +214,7 @@ namespace DyeingComputer.UserClass
Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
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"); }
}//当前信息
@ -223,7 +223,7 @@ namespace DyeingComputer.UserClass
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"); }
}//当前工作表
@ -232,7 +232,7 @@ namespace DyeingComputer.UserClass
if (SYSKEY == MainWindowViewModel.SYSKEY)
{
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.SYSlog);
client.SendAsync("SC832" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.SYSlog);
}
else { client.SendAsync("SC999"); }
}//当前细节信息
@ -240,7 +240,7 @@ namespace DyeingComputer.UserClass
{
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"); }
}//数字开关表
@ -248,7 +248,7 @@ namespace DyeingComputer.UserClass
{
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"); }
}//寄存器表
@ -256,7 +256,7 @@ namespace DyeingComputer.UserClass
{
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"); }
}//缓存表

Write Preview
Loading…
Cancel
Save