Merge branch '新增连廊线开发' of http://120.77.11.229:3000/zuolinhao/YG-MW-WCS into 新增连廊线开发

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

@@ -173,11 +173,12 @@ namespace WCS.Service.Works.Stations
                 addrTo = 2122;
                 arr = Device.Find("2108", "2114", "2116", "2117", "2328").Select(v => v.Device<IStation521, IStation520>()).ToArray();
 
+                if (arr.Any(v => v.Entity.CODE == "2114" && v.Data.PH_STATUS && v.Data.TASKNUM > 0 && v.Data.GOODSEND == 0)) throw new Exception("交通管制,2114有出库任务");
+
                 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.空闲)
+                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正在出库");
             }