From bff7f0c802bc0c1463700ed21c90066f8176c5e6 Mon Sep 17 00:00:00 2001 From: "SIC1016\\caipeilun" <123456> Date: Mon, 19 Feb 2024 08:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9multiProcess=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E9=80=BB=E8=BE=91,=E5=8F=96=E6=B6=88processi?= =?UTF-8?q?dle=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessCenter/MultiProcessClient.cs | 36 +++---------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessCenter/MultiProcessClient.cs b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessCenter/MultiProcessClient.cs index 9eb845e..55832af 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessCenter/MultiProcessClient.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessCenter/MultiProcessClient.cs @@ -309,20 +309,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter string state = (string)DATA.Poll("PM1.Status"); if (state != null) { - if (state == "Process" || state == "ToProcess") + if (state == "Process" || state == "PostProcess") { if (!Service.UpdateChamberState(_name, "PM1", state, "2")) { 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")) { return false; @@ -336,20 +329,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter string state = (string)DATA.Poll("PM2.Status"); if (state != null) { - if (state == "Process" || state == "ToProcess") + if (state == "Process"|| state == "PostProcess") { if (!Service.UpdateChamberState(_name, "PM2", state, "2")) { 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")) { return false; @@ -375,20 +361,13 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter string state = (string)DATA.Poll("PM1.Status"); 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")) { return false; } } - else if ((string)args[0] == "QuitProcess") - { - if (!Service.UpdateChamberState(_name, "PM1", state, "1")) - { - 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"); 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")) { return false; } } - else if ((string)args[0] == "QuitProcess") - { - if (!Service.UpdateChamberState(_name, "PM2", state, "1")) - { - return false; - } - } else return false; } else return false;