fix

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);
+            return source.PROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRGV520).AssemblyQualifiedName || v.DB.PROTOCOL == typeof(IDRGV520).AssemblyQualifiedName);
         }
 
         public static bool IsConv(this WCS_DEVICE source)

Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -58,10 +58,10 @@ namespace WCS.Service.Works.Stations
                 inTemp = 2272;
                 trafficControl = "2108-2114-2116-2117-2328";
                 arr = Device.Find("2108", "2114", "2116", "2117", "2328").Select(v => v.Device<IStation521, IStation520>()).ToArray();
-                var rgv = Device.Find("RGV4").Device<IRGV521, IRGV520>();
-                if (rgv.Data2.Trigger != 0)
+                var rgv = Device.Find("RGV4").Device<IDRGV521, IDRGV520>();
+                if (rgv.Data2.Trigger_1 != 0 && rgv.Data2.Trigger_2 != 0)
                     throw new Exception("RGV4任务触发中");
-                if (rgv.Data.DestPosition == 2114 && rgv.Data.SystemStatus != RGVRunStatus.空闲)
+                if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.DestPosition_1 == 2114) && rgv.Data.SystemStatus != RGVRunStatus.空闲)
                 {
                     flag = true;
                 }