fix

Projects/永冠/WCS.Service/DeviceExtentions.cs

@@ -57,14 +57,14 @@ namespace WCS.Service
             return source.GetNext(endAddr, null);
         }
 
-            /// <summary>
-            /// 获取从source到endaddr的路径中的下一个位置
-            /// </summary>
-            /// <param name="source">起始位置</param>
-            /// <param name="endAddr">目标位置</param>
-            /// <param name="condition">路径筛选条件</param>
-            /// <returns></returns>
-        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr,Func<List<WCS_DEVICE>,bool> condition)
+        /// <summary>
+        /// 获取从source到endaddr的路径中的下一个位置
+        /// </summary>
+        /// <param name="source">起始位置</param>
+        /// <param name="endAddr">目标位置</param>
+        /// <param name="condition">路径筛选条件</param>
+        /// <returns></returns>
+        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition)
         {
             var path = source.GetPath(endAddr, condition);
             if (Ltc.Do(path, v => v == null || v.Count == 0))
@@ -90,7 +90,7 @@ namespace WCS.Service
                 else
                     return null;
             }
-            else 
+            else
             {
                 return path.First();
             }
@@ -103,7 +103,7 @@ namespace WCS.Service
 
         public static bool IsConv(this WCS_DEVICE source)
         {
-            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IStation520).AssemblyQualifiedName);
+            return source.PROTOCOLS.Any(v => v.DB.PLC.ENABLED && (v.DB.PROTOCOL == typeof(IStation520).AssemblyQualifiedName));
         }
 
         public static bool IsSC(this WCS_DEVICE source)