bug修改

source/DeviceLibrary/duoStore/AxisBean.cs

@@ -27,7 +27,7 @@ namespace OnlineStore.DeviceLibrary
         private bool IsIntSlvBlock = false;
         private bool IsIntSlvBlock = false;
         public bool Open(bool isCheck, out string Msg)
         public bool Open(bool isCheck, out string Msg)
         {
         {
-            Msg = "";
+               Msg = "";
             string portName = Config.DeviceName;
             string portName = Config.DeviceName;
             int slvAddr = Config.GetAxisValue();
             int slvAddr = Config.GetAxisValue();
             //打开所有轴 
             //打开所有轴 

source/DeviceLibrary/duoStore/EquipBase.cs

@@ -221,6 +221,8 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
                 else if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
                 {
                 {
+                    ConfigIO io = baseConfig.getWaitIO(wait.IoType);
+                    NotOkMsg = " 等待【" + io.DisplayStr + "】=【" + wait.IoValue + "】";
                     wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
                     wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
                     int timeOutMs = StoreManager.Config.IOSingle_TimerOut;
                     int timeOutMs = StoreManager.Config.IOSingle_TimerOut;
                     if (!wait.IsEnd)
                     if (!wait.IsEnd)
@@ -231,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
                         } 
                         } 
                         else if (span.TotalMilliseconds > timeOutMs && NoAlarm())
                         else if (span.TotalMilliseconds > timeOutMs && NoAlarm())
                         {
                         {
-                            ConfigIO io = baseConfig.getWaitIO(wait.IoType);
+                          
                             WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
                             WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
                             Alarm(AlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
                             Alarm(AlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
                             LogUtil.error(Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", logType + 14);
                             LogUtil.error(Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", logType + 14);

source/DeviceLibrary/duoStore/StoreManager.cs

-using log4net;
+using DeviceLib;
+using log4net;
 using OnlineStore.Common;
 using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
@@ -107,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.info("加载料仓完成！");
                         LogUtil.info("加载料仓完成！");
 
 
                     }
                     }
-                     
+                    ACServerManager.LogEvent += ACServerManager_LogEvent;
                     Store = new DUOStoreBean(Config, storeConfig);
                     Store = new DUOStoreBean(Config, storeConfig);
                 }
                 }
             }
             }
@@ -175,6 +176,21 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
+        private static void ACServerManager_LogEvent(InfoType type, string msg)
+        {
+            if (type.Equals(InfoType.Error))
+            {
+                LogUtil.error(msg);
+            }
+            else if (type.Equals(InfoType.Info))
+            {
+                LogUtil.info(msg);
+            }
+            else
+            {
+                LogUtil.debug(msg);
+            }
+        }
         #endregion
         #endregion
 
 
         #region 位置加载
         #region 位置加载