修改multiProcess客户端逻辑,取消processidle判断
This commit is contained in:
parent
4c7e1e2c82
commit
bff7f0c802
|
@ -309,20 +309,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
|
||||||
string state = (string)DATA.Poll("PM1.Status");
|
string state = (string)DATA.Poll("PM1.Status");
|
||||||
if (state != null)
|
if (state != null)
|
||||||
{
|
{
|
||||||
if (state == "Process" || state == "ToProcess")
|
if (state == "Process" || state == "PostProcess")
|
||||||
{
|
{
|
||||||
if (!Service.UpdateChamberState(_name, "PM1", state, "2"))
|
if (!Service.UpdateChamberState(_name, "PM1", state, "2"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (state == "ProcessIdle" || state == "ToProcessIdle")
|
|
||||||
{
|
|
||||||
if (!Service.UpdateChamberState(_name, "PM1", state, "1"))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!Service.UpdateChamberState(_name, "PM1", state, "0"))
|
else if (!Service.UpdateChamberState(_name, "PM1", state, "0"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -336,20 +329,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
|
||||||
string state = (string)DATA.Poll("PM2.Status");
|
string state = (string)DATA.Poll("PM2.Status");
|
||||||
if (state != null)
|
if (state != null)
|
||||||
{
|
{
|
||||||
if (state == "Process" || state == "ToProcess")
|
if (state == "Process"|| state == "PostProcess")
|
||||||
{
|
{
|
||||||
if (!Service.UpdateChamberState(_name, "PM2", state, "2"))
|
if (!Service.UpdateChamberState(_name, "PM2", state, "2"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (state == "ProcessIdle" || state == "ToProcessIdle")
|
|
||||||
{
|
|
||||||
if (!Service.UpdateChamberState(_name, "PM2", state, "1"))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!Service.UpdateChamberState(_name, "PM2", state, "0"))
|
else if (!Service.UpdateChamberState(_name, "PM2", state, "0"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -375,20 +361,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
|
||||||
string state = (string)DATA.Poll("PM1.Status");
|
string state = (string)DATA.Poll("PM1.Status");
|
||||||
if (args.Length == 1)
|
if (args.Length == 1)
|
||||||
{
|
{
|
||||||
if ((string)args[0] == "QuitHeating" || (string)args[0] == "QuitProcessIdle")
|
if ((string)args[0] == "QuitHeating" || (string)args[0] == "QuitProcess")
|
||||||
{
|
{
|
||||||
if (!Service.UpdateChamberState(_name, "PM1",state, "0"))
|
if (!Service.UpdateChamberState(_name, "PM1",state, "0"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((string)args[0] == "QuitProcess")
|
|
||||||
{
|
|
||||||
if (!Service.UpdateChamberState(_name, "PM1", state, "1"))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else return false;
|
else return false;
|
||||||
}
|
}
|
||||||
else return false;
|
else return false;
|
||||||
|
@ -398,20 +377,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
|
||||||
string state = (string)DATA.Poll("PM2.Status");
|
string state = (string)DATA.Poll("PM2.Status");
|
||||||
if (args.Length == 1)
|
if (args.Length == 1)
|
||||||
{
|
{
|
||||||
if ((string)args[0] == "QuitHeating" || (string)args[0] == "QuitProcessIdle")
|
if ((string)args[0] == "QuitHeating" || (string)args[0] == "QuitProcess")
|
||||||
{
|
{
|
||||||
if (!Service.UpdateChamberState(_name, "PM2", state, "0"))
|
if (!Service.UpdateChamberState(_name, "PM2", state, "0"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((string)args[0] == "QuitProcess")
|
|
||||||
{
|
|
||||||
if (!Service.UpdateChamberState(_name, "PM2", state, "1"))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else return false;
|
else return false;
|
||||||
}
|
}
|
||||||
else return false;
|
else return false;
|
||||||
|
|
Loading…
Reference in New Issue