Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
142e653276
4 files changed
+103
-57
No files matched your search
@@ -169,16 +169,33 @@ namespace DyeingComputer.UserClass
|
||||
{
|
||||
SQLDATA.TechnologicalProcess_START(dat_821.GetValue("ProgramID").ToString());
|
||||
}
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP") { }
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "PAUSE") { }
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "CONTINUE") { }
|
||||
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP")
|
||||
{
|
||||
MainWindowViewModel.WORK_RUN = 0;//停止
|
||||
MainWindowViewModel.DIDETime = 0;
|
||||
}
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "PAUSE")
|
||||
{
|
||||
MainWindowViewModel.WORK_RUN = 1;//暂停
|
||||
}
|
||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "CONTINUE")
|
||||
{
|
||||
MainWindowViewModel.WORK_RUN = 2;//暂停
|
||||
}
|
||||
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")),
|
||||
Convert.ToDouble(dat_821.GetValue("P2")), Convert.ToDouble(dat_821.GetValue("P3")),
|
||||
Convert.ToDouble(dat_821.GetValue("P4")), Convert.ToDouble(dat_821.GetValue("P5")));
|
||||
}
|
||||
client.SendAsync("SC821" + SYSKEY + SYSDAT);
|
||||
}
|
||||
catch { client.SendAsync("SC921"); }
|
||||
}
|
||||
else { client.SendAsync("SC999"); }
|
||||
}//启停指令
|
||||
}//启停跳步指令
|
||||
else if (SYSAPI == "SC830")
|
||||
{
|
||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||
@@ -201,6 +218,24 @@ namespace DyeingComputer.UserClass
|
||||
}
|
||||
else { client.SendAsync("SC999"); }
|
||||
}//当前信息
|
||||
else if (SYSAPI == "SC831")
|
||||
{
|
||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||
{
|
||||
|
||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" +TechnologicalProcessView.sql.Tables[0].ToJsonString());
|
||||
}
|
||||
else { client.SendAsync("SC999"); }
|
||||
}//当前工作表
|
||||
else if (SYSAPI == "SC832")
|
||||
{
|
||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||
{
|
||||
|
||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.SYSlog);
|
||||
}
|
||||
else { client.SendAsync("SC999"); }
|
||||
}//当前细节信息
|
||||
else if (SYSAPI == "SC851")
|
||||
{
|
||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||
|
||||
Reference in new issue
Block a user