林豪 左 hace 2 años
padre
commit
a6c4613c04
Se han modificado 1 ficheros con 4 adiciones y 4 borrados
  1. 4 4
      Projects/永冠/WCS.Service/DeviceExtentions.cs

+ 4 - 4
Projects/永冠/WCS.Service/DeviceExtentions.cs

@@ -98,7 +98,7 @@ namespace WCS.Service
 
         public static bool IsRGV(this WCS_DEVICE source)
         {
-            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRGV520).AssemblyQualifiedName || v.DB.PROTOCOL == typeof(IDRGV520).AssemblyQualifiedName);
+            return source.PROTOCOLS.Any(v => v.DB.PLC.ENABLED && (v.DB.PROTOCOL == typeof(IRGV520).AssemblyQualifiedName || v.DB.PROTOCOL == typeof(IDRGV520).AssemblyQualifiedName));
         }
 
         public static bool IsConv(this WCS_DEVICE source)
@@ -108,17 +108,17 @@ namespace WCS.Service
 
         public static bool IsSC(this WCS_DEVICE source)
         {
-            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(ISC520).AssemblyQualifiedName);
+            return source.PROTOCOLS.Any(v => v.DB.PLC.ENABLED && (v.DB.PROTOCOL == typeof(ISC520).AssemblyQualifiedName));
         }
 
         public static bool IsRobot(this WCS_DEVICE source)
         {
-            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRobot).AssemblyQualifiedName);
+            return source.PROTOCOLS.Any(v => v.DB.PLC.ENABLED && (v.DB.PROTOCOL == typeof(IRobot).AssemblyQualifiedName));
         }
 
         public static bool IsRobotStation(this WCS_DEVICE source)
         {
-            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRobotStation).AssemblyQualifiedName);
+            return source.PROTOCOLS.Any(v => v.DB.PLC.ENABLED && (v.DB.PROTOCOL == typeof(IRobotStation).AssemblyQualifiedName));
         }
 
         public static bool IsTunnel(this WCS_DEVICE source)