| 
														
															@@ -135,7 +135,7 @@ namespace WCS.Service.Extensions 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             var a = Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000) 
														 | 
														
														 | 
														
															             var a = Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         .Where(v => v.Entity.CODE.ToShort() != v.Data2.Goodsend && v.Data2.Goodsend != 0) 
														 | 
														
														 | 
														
															                         .Where(v => v.Entity.CODE.ToShort() != v.Data2.Goodsend && v.Data2.Goodsend != 0) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         .ToList(); 
														 | 
														
														 | 
														
															                         .ToList(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return a.Count == 0 ? null : a; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return a.Count == 0 ? new List<Device<IStation520, IStation521, IStation523>>() : a; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         /// <summary> 
														 | 
														
														 | 
														
															         /// <summary> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -187,8 +187,8 @@ namespace WCS.Service.Extensions 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         public RGVDevice CurrentRGV() 
														 | 
														
														 | 
														
															         public RGVDevice CurrentRGV() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         { 
														 | 
														
														 | 
														
															         { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //RGV与站台距离误差为 正负50 
														 | 
														
														 | 
														
															             //RGV与站台距离误差为 正负50 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            var max = Position + 50; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            var min = Position - 50; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            var max = Position + 500; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            var min = Position - 500; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return RgvList.FirstOrDefault(v => v.Data2.Position < max && v.Data2.Position > min); 
														 | 
														
														 | 
														
															             return RgvList.FirstOrDefault(v => v.Data2.Position < max && v.Data2.Position > min); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -823,7 +823,7 @@ namespace WCS.Service.Extensions 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G1222",0,"RGV1",0), 
														 | 
														
														 | 
														
															                 new StationLocation("G1222",0,"RGV1",0), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G1164",0,"RGV1",0), 
														 | 
														
														 | 
														
															                 new StationLocation("G1164",0,"RGV1",0), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G1",486326,"RGV3",1567770), 
														 | 
														
														 | 
														
															                 new StationLocation("G1",486326,"RGV3",1567770), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                new StationLocation("G2",694439,"RGV3",1567770), 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                new StationLocation("G2",693631,"RGV3",1567770), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G3",789931,"RGV3",1567770), 
														 | 
														
														 | 
														
															                 new StationLocation("G3",789931,"RGV3",1567770), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G4",961595,"RGV3",1567770), 
														 | 
														
														 | 
														
															                 new StationLocation("G4",961595,"RGV3",1567770), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 new StationLocation("G5",1013350,"RGV3",1567770), 
														 | 
														
														 | 
														
															                 new StationLocation("G5",1013350,"RGV3",1567770), 
														 |