Administrator 3 years ago
parent
commit
f45b9879a5
2 changed files with 3 additions and 3 deletions
  1. BIN
      DLL/PLC.Siemens.dll
  2. 3 3
      Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

BIN
DLL/PLC.Siemens.dll


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

@@ -176,9 +176,9 @@ namespace WCS.Service.Works.Stations
                 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_1 == 2114 || rgv.Data.StartPosition_1 == 2114 || rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) 
-                    && rgv.Data.SystemStatus != RGVRunStatus.空闲 
-                    || (rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) && rgv.Data.PH_Status_1)
+                if (((rgv.Data.DestPosition_1 == 2114 || rgv.Data.StartPosition_1 == 2114 || rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) 
+                                              && rgv.Data.SystemStatus != RGVRunStatus.空闲)
+                    || ((rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) && rgv.Data.PH_Status_1))
                     throw new Exception("交通管制,RGV4正在出库");
             }