Administrator 3 years ago
parent
commit
368db9731e
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

+ 4 - 3
Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -172,10 +172,11 @@ namespace WCS.Service.Works.Stations
                 inTemp = 2272;
                 addrTo = 2122;
                 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.空闲)
                     throw new Exception("交通管制,RGV4正在出库");
             }