大更新

2022-12-16 13:01:24 +08:00
parent b593a243a5
commit eb23e102b4
1279 changed files with 29652 additions and 1097632 deletions
--- a/Handlers/EventHandlers/AlarmClearedHandler.cs
+++ b/Handlers/EventHandlers/AlarmClearedHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("AlarmID"):
@@ -79,9 +79,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = alarmReportBody;
--- a/Handlers/EventHandlers/AlarmDetectedHandler.cs
+++ b/Handlers/EventHandlers/AlarmDetectedHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("AlarmID"):
@@ -79,9 +79,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = alarmReportBody;
--- a/Handlers/EventHandlers/ContainerPlaceHandler.cs
+++ b/Handlers/EventHandlers/ContainerPlaceHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = containerPlaceBody;
--- a/Handlers/EventHandlers/ContainerRemoveHandler.cs
+++ b/Handlers/EventHandlers/ContainerRemoveHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = containerPlaceBody;
--- a/Handlers/EventHandlers/ControlStateLocalHandler.cs
+++ b/Handlers/EventHandlers/ControlStateLocalHandler.cs
@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = controlStateChangeBody;
--- a/Handlers/EventHandlers/ControlStateRemoteHandler
+++ b/Handlers/EventHandlers/ControlStateRemoteHandler
@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = controlStateChangeBody;
--- a/Handlers/EventHandlers/EquipmentStateChangeHandler.cs
+++ b/Handlers/EventHandlers/EquipmentStateChangeHandler.cs
@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = equipmentStateChangeBody;
--- a/Handlers/EventHandlers/MESRequestHandler.cs
+++ b/Handlers/EventHandlers/MESRequestHandler.cs
@@ -78,7 +78,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
            item.RCMD = "NEW-SUBSTRATEID";
            Param p1 = new Param();
            p1.ParanName = "ToolName";
-            p1.ParanVal = Configuration.conf.connectSetting.name;
+            p1.ParanVal = Configurations.conf.connectSetting.name;
            item.PARAMS.Add(p1);
            Param p2 = new Param();
            p2.ParanName = "STATIONID";
@@ -109,7 +109,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers

        public static void RequestS1F3(JObject body = null)
        {
-            Global.MF.pushBotton("S1F3Request");
+            Global.MF.pushBotton("S1F3");
        }

        public static void RequestS2F13(JObject body = null)
@@ -152,7 +152,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
            item.RCMD = "EQSTATEUPDATE";
            Param p1 = new Param();
            p1.ParanName = "ToolName";
-            p1.ParanVal = Configuration.conf.connectSetting.name;
+            p1.ParanVal = Configurations.conf.connectSetting.name;
            item.PARAMS.Add(p1);
            Param p2 = new Param();
            p2.ParanName = "NEWSTATE";
@@ -185,9 +185,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
        public static void UploadFile(JObject body = null)
        {
            long fileId = long.Parse(body["fileId"].ToString());
-            DownLoadFileParam downLoadFileParam = new DownLoadFileParam(fileId, Configuration.conf.connectSetting.name + ".xml", "1");
+            DownLoadFileParam downLoadFileParam = new DownLoadFileParam(fileId, Configurations.conf.connectSetting.name + ".xml", "1");
            string param = SECSUtil.ObjectToGetParam(downLoadFileParam);
-            HttpWebResponse response = HttpUtils.sentGET(Configuration.conf.httpConfiguration.fileDownloadUrl, param);
+            HttpWebResponse response = HttpUtils.sentGET(Configurations.conf.httpConfiguration.fileDownloadUrl, param);
            if(response.StatusCode != HttpStatusCode.OK)
            {
                return;
@@ -208,5 +208,81 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                respnseStream.Close();
            }
        }
+
+        public static void RequestTraceDataInit(JObject body = null)
+        {
+            S2F23Item item = new S2F23Item();
+            if (string.IsNullOrEmpty(body["totsmp"].ToString())|| string.IsNullOrEmpty(body["dsper"].ToString())|| string.IsNullOrEmpty(body["state"].ToString()))
+            {
+                LoggerService.MQLogger.Debug("值不能为空");
+                return;
+            }
+            if (body["state"].ToString().Equals("Y"))
+            {
+                item.TOTSMP = ushort.Parse(body["totsmp"].ToString());
+            }
+            else
+            {
+                item.TOTSMP = 0;
+            }
+            string dsper = body["dsper"].ToString();
+            while(dsper.Length < 6)
+            {
+                dsper = "0" + dsper;
+            }
+            item.DSPER_hhmmss = dsper;
+            item.TRID = 1;
+            item.REPGSZ = 1;
+            string[] svs = body["vID"].ToString().FromJson<string[]>();
+            List<ushort> SVID = new List<ushort>();
+            foreach (string s in svs)
+            {
+                SVID.Add(ushort.Parse(s));
+            }
+            item.SVID = SVID;
+            foreach(WorkFlow workFlow in SimulatorInfo.Instance.Scenarios.Scenarios.FirstOrDefault(sc => sc.Name == "Init").WorkFlows)
+            {
+                if (workFlow.MessageName.Equals("S2F23"))
+                {
+                    workFlow.MessageContent = item.ToJson<S2F23Item>();
+                    break;
+                }
+            }
+        }
+
+        public static void RequestTraceData(JObject body = null)
+        {
+            S2F23Item item = new S2F23Item();
+            if (string.IsNullOrEmpty(body["totsmp"].ToString()) || string.IsNullOrEmpty(body["dsper"].ToString()) || string.IsNullOrEmpty(body["state"].ToString()))
+            {
+                LoggerService.MQLogger.Debug("值不能为空");
+                return;
+            }
+            if (body["state"].ToString().Equals("Y"))
+            {
+                item.TOTSMP = ushort.Parse(body["totsmp"].ToString());
+            }
+            else
+            {
+                item.TOTSMP = 0;
+            }
+            string dsper = body["dsper"].ToString();
+            while (dsper.Length < 6)
+            {
+                dsper = "0" + dsper;
+            }
+            item.DSPER_hhmmss = dsper;
+            item.TRID = 1;
+            item.REPGSZ = 1;
+            string[] svs = body["vID"].ToString().FromJson<string[]>();
+            List<ushort> SVID = new List<ushort>();
+            foreach (string s in svs)
+            {
+                SVID.Add(ushort.Parse(s));
+            }
+            item.SVID = SVID;
+
+            Command.S2F23Command(item);
+        }
    }
 }
--- a/Handlers/EventHandlers/Machine_Data_1Handler.cs
+++ b/Handlers/EventHandlers/Machine_Data_1Handler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
                mQMessage.body = machineDataBody;
                Task.Run(() => MainForm.mq.EAPRequest(mQMessage));
--- a/Handlers/EventHandlers/MaintenanceEndHandler.cs
+++ b/Handlers/EventHandlers/MaintenanceEndHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -58,9 +58,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = maintenanceBody;
--- a/Handlers/EventHandlers/MaintenanceStartHandler.cs
+++ b/Handlers/EventHandlers/MaintenanceStartHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -58,9 +58,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = maintenanceBody;
--- a/Handlers/EventHandlers/MaterialReceivedForFILOBufferHandler.cs
+++ b/Handlers/EventHandlers/MaterialReceivedForFILOBufferHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialReceivedForTransBody;
--- a/Handlers/EventHandlers/MaterialReceivedForIoPortHandler.cs
+++ b/Handlers/EventHandlers/MaterialReceivedForIoPortHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialReceivedForTransBody;
--- a/Handlers/EventHandlers/MaterialReceivedForLSTAHandler.cs
+++ b/Handlers/EventHandlers/MaterialReceivedForLSTAHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("VirtualSubstrateID"):
@@ -78,9 +78,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = lSTAMaterialReceivedBody;
--- a/Handlers/EventHandlers/MaterialReceivedForTransHandler.cs
+++ b/Handlers/EventHandlers/MaterialReceivedForTransHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialReceivedForTransBody;
--- a/Handlers/EventHandlers/MaterialRemovedForFILOBufferHandler.cs
+++ b/Handlers/EventHandlers/MaterialRemovedForFILOBufferHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialRemovedBody;
--- a/Handlers/EventHandlers/MaterialRemovedForIoPortHandler.cs
+++ b/Handlers/EventHandlers/MaterialRemovedForIoPortHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialRemovedBody;
--- a/Handlers/EventHandlers/MaterialRemovedForLSTAHandler.cs
+++ b/Handlers/EventHandlers/MaterialRemovedForLSTAHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialRemovedBody;
--- a/Handlers/EventHandlers/MaterialRemovedForTransHandler.cs
+++ b/Handlers/EventHandlers/MaterialRemovedForTransHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialRemovedBody;
--- a/Handlers/EventHandlers/MaterialRemovedFromContainerHandler.cs
+++ b/Handlers/EventHandlers/MaterialRemovedFromContainerHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -128,9 +128,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialStoredToContainerBody;
--- a/Handlers/EventHandlers/MaterialStoredToContainerHandler.cs
+++ b/Handlers/EventHandlers/MaterialStoredToContainerHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -128,9 +128,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialStoredToContainerBody;
--- a/Handlers/EventHandlers/MaterialStoredToPalletHandler.cs
+++ b/Handlers/EventHandlers/MaterialStoredToPalletHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -82,9 +82,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialStoredToPalletBody;
--- a/Handlers/EventHandlers/Material_HoldHandler.cs
+++ b/Handlers/EventHandlers/Material_HoldHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialHoldBody;
--- a/Handlers/EventHandlers/Material_ReceivedHandler.cs
+++ b/Handlers/EventHandlers/Material_ReceivedHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -83,9 +83,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    index++;
                }

-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0); 
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1); 
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialReceivedBody;
--- a/Handlers/EventHandlers/Material_RemovedHandler.cs
+++ b/Handlers/EventHandlers/Material_RemovedHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialRemovedBody;
--- a/Handlers/EventHandlers/Material_ScrapHandler.cs
+++ b/Handlers/EventHandlers/Material_ScrapHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = materialScrapBody;
--- a/Handlers/EventHandlers/PalletCompletedHandler.cs
+++ b/Handlers/EventHandlers/PalletCompletedHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -89,9 +89,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = palletCompletedBody;
--- a/Handlers/EventHandlers/PalletRemovedHandler.cs
+++ b/Handlers/EventHandlers/PalletRemovedHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -72,9 +72,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = palletRemovedBody;
--- a/Handlers/EventHandlers/ProcessProgramChangeBodyHandler.cs
+++ b/Handlers/EventHandlers/ProcessProgramChangeBodyHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("RecipeName"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = processProgramChangeBody;
--- a/Handlers/EventHandlers/ProcessRecipeSelectedHandler.cs
+++ b/Handlers/EventHandlers/ProcessRecipeSelectedHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = processRecipeSelectedBody;
--- a/Handlers/EventHandlers/Process_FinishHandler.cs
+++ b/Handlers/EventHandlers/Process_FinishHandler.cs
@@ -44,7 +44,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -93,9 +93,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
                mQMessage.body = processFinishBody;
                Task.Run(() => 
@@ -112,7 +112,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers

        public void formatCheck(uint id,SECSItem item)
        {
-            eSECS_FORMAT standardFormat = Configuration.conf.sRDConfiguration.GetSECS_FORMAT(id);
+            eSECS_FORMAT standardFormat = Configurations.conf.sRDConfiguration.GetSECS_FORMAT(id);
            eSECS_FORMAT format = item.Format;
            if (standardFormat != format)
            {
@@ -120,7 +120,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                mQMessage.header.messageName = "FormatError";
                FormatErrorBody formatErrorBody = new FormatErrorBody();
                formatErrorBody.eventName = "ProcessFinished";
-                formatErrorBody.paramName = Configuration.conf.sRDConfiguration.tryGetSVOrDV(id);
+                formatErrorBody.paramName = Configurations.conf.sRDConfiguration.tryGetSVOrDV(id);
                formatErrorBody.paramValue = item.Value.ToString();
                switch (format)
                {
--- a/Handlers/EventHandlers/Process_StartHandler.cs
+++ b/Handlers/EventHandlers/Process_StartHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("SubstrateID"):
@@ -83,9 +83,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = processStartedBody;
--- a/Handlers/EventHandlers/SlotlistHandler.cs
+++ b/Handlers/EventHandlers/SlotlistHandler.cs
@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -77,9 +77,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = slotListBody;
--- a/Handlers/EventHandlers/SpoolingDeactivatedHandler.cs
+++ b/Handlers/EventHandlers/SpoolingDeactivatedHandler.cs
@@ -34,9 +34,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
        {
            try
            {
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
                Scenario scenario = SimulatorInfo.Instance.Scenarios.Scenarios.FirstOrDefault(sc => sc.Name == "Init");
                if (scenario.CurrentStep == 8)
--- a/Handlers/EventHandlers/UserLoggedOffHandler.cs
+++ b/Handlers/EventHandlers/UserLoggedOffHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = userLoggedOnBody;
--- a/Handlers/EventHandlers/UserLoggedOnHandler.cs
+++ b/Handlers/EventHandlers/UserLoggedOnHandler.cs
@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                int index = 1;
                foreach (var key in even.validVariables)
                {
-                    string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
+                    string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
                    switch (name)
                    {
                        case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
                    trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
                    index++;
                }
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);

                mQMessage.body = userLoggedOnBody;
--- a/Handlers/S1F14Handler.cs
+++ b/Handlers/S1F14Handler.cs
@@ -26,7 +26,7 @@ namespace Glorysoft.SECS.EQP.Handlers
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
            SECSMessage reply = trans.Secondary;
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            MQMessage mQMessage = new MQMessage();
            mQMessage.header.messageName = "EstablishCommunication";
--- a/Handlers/S1F16Handler.cs
+++ b/Handlers/S1F16Handler.cs
@@ -23,7 +23,7 @@ namespace Glorysoft.SECS.EQP.Handlers
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
            SECSMessage reply = trans.Secondary;
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            if (trans.Tag != null)
            {
--- a/Handlers/S1F18Handler
+++ b/Handlers/S1F18Handler
@@ -23,7 +23,7 @@ namespace Glorysoft.SECS.EQP.Handlers
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
            SECSMessage reply = trans.Secondary;
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            if (trans.Tag != null)
            {
--- a/Handlers/S1F2Handler.cs
+++ b/Handlers/S1F2Handler.cs
@@ -7,8 +7,11 @@
 // 	更新历史:
 // 			+ 创建 S1F2Handler.cs 文件. by Michael @2019/11/8 0:08
 // ********************************************************************************
+using ARI.EAP.HOST;
+using ARI.EAP.HOST.Common;
 using Glorysoft.SECS.EQP.Common;
 using Glorysoft.SECS.EQP.Message;
+using Glorysoft.SECS.EQP.Utilities;
 using Glorysoft.SECSwell;
 using System.Threading;

@@ -18,15 +21,9 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            SECSMessage reply = trans.Secondary;
-
-            S1F2Item item = new S1F2Item();
-            item.MDLN = reply.Root.Item(1).Value.ToString();
-            item.SOFTREV = reply.Root.Item(2).Value.ToString();
-            var scenario = trans.Tag as Scenario;
-            scenario.CurrentStep++;
-            Thread.Sleep(500);
-            scenario.ExecuteNextStep();
+            EquipmentStatus.S1F1HeartBit.timer2.Stop();
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
+            LoggerService.SECSLogger.Info(trans.Secondary);
        }
    }
 }
--- a/Handlers/S1F4Handler.cs
+++ b/Handlers/S1F4Handler.cs
@@ -27,9 +27,9 @@ namespace Glorysoft.SECS.EQP.Handlers
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
            MQMessage mQMessage = new MQMessage();
-            mQMessage.header.messageName = "SVList";
+            mQMessage.header.messageName = "SvList";
            SVListBody sVListBody = new SVListBody();
-            var content = Configuration.conf.commandContentCollection.findContent("S1F3").content;
+            var content = Configurations.conf.commandContentCollection.findContent("S1F3").content;
            for(int i = 0; i < content.Count; i++)
            {
                switch (content[i])
@@ -77,7 +77,7 @@ namespace Glorysoft.SECS.EQP.Handlers
                }
            }

-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);

            mQMessage.body = sVListBody;
--- a/Handlers/S2F14Handler.cs
+++ b/Handlers/S2F14Handler.cs
@@ -30,14 +30,14 @@ namespace Glorysoft.SECS.EQP.Handlers
            mQMessage.header.messageName = "ECRequest";
            ECRequestBody eCRequestBody = new ECRequestBody();
            int index = 1;
-            foreach(var ec in Configuration.conf.sRDConfiguration.ecvs)
+            foreach(var ec in Configurations.conf.sRDConfiguration.ecvs)
            {
                eCRequestBody.ECList.Add(ec.name, trans.Secondary.Root.Item(index).Value.ToString());
                trans.Secondary.Root.Item(index).Name = ec.name;
                index++;
            }

-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);

            mQMessage.body = eCRequestBody;
--- a/Handlers/S2F16Handler.cs
+++ b/Handlers/S2F16Handler.cs
@@ -27,7 +27,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            SECSMessage reply = trans.Secondary;
            S2F16Item item = new S2F16Item();
--- a/Handlers/S2F24Handler.cs
+++ b/Handlers/S2F24Handler.cs
@@ -22,7 +22,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            if (trans.Tag != null)
            {
--- a/Handlers/S2F34Handler.cs
+++ b/Handlers/S2F34Handler.cs
@@ -25,9 +25,9 @@ namespace Glorysoft.SECS.EQP.Handlers
        {
            var sc = trans.Tag as Scenario;
            if(!EquipmentStatus.initStatus)
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Delete Report", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Delete Report", 1);
            else
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Define Report", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Define Report", 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            EquipmentStatus.initStatus = true;

--- a/Handlers/S2F36Handler.cs
+++ b/Handlers/S2F36Handler.cs
@@ -25,9 +25,9 @@ namespace Glorysoft.SECS.EQP.Handlers
        {
            var sc = trans.Tag as Scenario;
            if (!EquipmentStatus.initStatus)
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Delete Link Report", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Delete Link Report", 1);
            else
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Define Link Report", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Define Link Report", 1);
            LoggerService.SECSLogger.Info(trans.Secondary);

            SECSMessage reply = trans.Secondary;
--- a/Handlers/S2F38Handler.cs
+++ b/Handlers/S2F38Handler.cs
@@ -22,7 +22,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            SECSMessage reply = trans.Secondary;

--- a/Handlers/S2F44Handler.cs
+++ b/Handlers/S2F44Handler.cs
@@ -22,7 +22,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            if (trans.Tag != null)
            {
--- a/Handlers/S2F50Handler.cs
+++ b/Handlers/S2F50Handler.cs
@@ -22,7 +22,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
        }
    }
--- a/Handlers/S5F4Handler.cs
+++ b/Handlers/S5F4Handler.cs
@@ -30,13 +30,13 @@ namespace Glorysoft.SECS.EQP.Handlers
            S5F4Item item = new S5F4Item();
            item.ACKC5 = reply.Root.Value.To<byte[]>().FirstOrDefault();
            MQMessage mQMessage = new MQMessage();
-            mQMessage.header.messageName = "Disable/EnableAlarm";
+            mQMessage.header.messageName = "DisableEnableAlarm";
            S5F3Body s5F3Body = new S5F3Body();
            s5F3Body.eventTimestamp = System.DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fff");
            if (EquipmentStatus.S5F3 == "AlarmEnable" && item.ACKC5 == 0)
            {
                Global.MF.S5F3BottonUpdate(EquipmentStatus.S5F3);
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Alarm Disable", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Alarm Disable", 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
                s5F3Body.enableAlarmState = "0";
                EquipmentStatus.S5F3 = "AlarmDisable"; 
@@ -44,7 +44,7 @@ namespace Glorysoft.SECS.EQP.Handlers
            else if(EquipmentStatus.S5F3 == "AlarmDisable" && item.ACKC5 == 0)
            {
                Global.MF.S5F3BottonUpdate(EquipmentStatus.S5F3);
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, "Alarm Enable", "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, "Alarm Enable", 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
                s5F3Body.enableAlarmState = "1";
                EquipmentStatus.S5F3 = "AlarmEnable"; 
--- a/Handlers/S5F6Handler.cs
+++ b/Handlers/S5F6Handler.cs
@@ -43,7 +43,7 @@ namespace Glorysoft.SECS.EQP.Handlers
                index++;
            }

-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
            if (trans.Tag != null)
            {
--- a/Handlers/S6F11Handler.cs
+++ b/Handlers/S6F11Handler.cs
@@ -34,7 +34,7 @@ namespace Glorysoft.SECS.EQP.Handlers
                context.ReplyMessage(trans);
                //int CEID = (int)primary.Root.Item(2).Value;
                uint CEID = (uint)primary.Root.Item(2).Value;
-                var even = Configuration.conf.sRDConfiguration.findEvent(CEID);
+                var even = Configurations.conf.sRDConfiguration.findEvent(CEID);
                string eventName = even.name;
                var handlerName = $"{eventName}Handler";
                if (EquipmentStatus.EventHandlers.ContainsKey(handlerName))
--- a/Handlers/S6F1Handler.cs
+++ b/Handlers/S6F1Handler.cs
@@ -32,9 +32,9 @@ namespace Glorysoft.SECS.EQP.Handlers
            {
                SECSMessage primary = trans.Primary;
                context.ReplyMessage(trans);
-                Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, trans.Primary.Description, "=" + trans.Primary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Receive, trans.Primary.Description, 0);
                LoggerService.SECSLogger.Info(trans.Primary);
-                Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, trans.Secondary.Description, "=" + trans.Secondary.SystemBytes.ToString());
+                Global.MF.addlog(trans, LoggerService.Send, trans.Secondary.Description, 1);
                LoggerService.SECSLogger.Info(trans.Secondary);
            }
            catch(Exception e)
--- a/Handlers/S6F24Handler.cs
+++ b/Handlers/S6F24Handler.cs
@@ -23,7 +23,7 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog( LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);

            S6F24Item item = new S6F24Item();
--- a/Handlers/S7F20Handler.cs
+++ b/Handlers/S7F20Handler.cs
@@ -25,8 +25,9 @@ namespace Glorysoft.SECS.EQP.Handlers
    {
        public void Execute(SECSContext context, SECSTransaction trans, SECSErrors err, string errmsg)
        {
-            Global.MF.addlog(LoggerService.EtoH, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Receive, trans.Description, "=" + trans.Secondary.SystemBytes.ToString());
+            Global.MF.addlog(trans, LoggerService.Receive, trans.Secondary.Description, 1);
            LoggerService.SECSLogger.Info(trans.Secondary);
+            
            SECSMessage reply = trans.Secondary;
            MQMessage mQMessage = new MQMessage();
            mQMessage.header.messageName = "RecipeListSend";