1

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs

@@ -76,10 +76,13 @@ namespace OnlineStore.DeviceLibrary
                         WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
                         WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
                         Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
                         Alarm(StoreAlarmType.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);
+                        if (!MoveInfo.OneWaitCanEndStep)
+                        {
                             isOk = false;
                             isOk = false;
                             break;
                             break;
                         }
                         }
                     }
                     }
+                }
                 else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                 else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                 {
                 {
                     wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
                     wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);

source/DeviceLibrary/device/halcon/CodeManager.cs

@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
     public class CodeManager
     public class CodeManager
     {
     {
         public static List<string> codeTypeList = new List<string>();
         public static List<string> codeTypeList = new List<string>();
-        public static List<string> balserNameList = new List<string>();
+        //public static List<string> balserNameList = new List<string>();
         public static List<string> hikNameList = new List<string>();
         public static List<string> hikNameList = new List<string>();
 
 
         private static char spiltChar = '#';
         private static char spiltChar = '#';