| 
					
				 | 
			
			
				@@ -334,7 +334,7 @@ namespace WCS.Service.Works.RGV 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         //.ToList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if (pickStation.Entity.CODE == "G19") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            var pickStations = Device.Find("G23").Create<StationDeviceGroup>().RGVGetTaskedDevice(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            var pickStations = Device.Find("G23").Create<StationDeviceGroup>().Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000).ToList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if (pickStations != null && pickStations.Any() && !obj.RGVList.Any(v => v.Data2.SystemStatus != RGVRunStatus.空闲 && v.Data2.DestPosition_1 == 23)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 obj.Move(Device.Find("G23").Create<StationDeviceGroup>()); 
			 |