|  | @@ -67,7 +67,7 @@ namespace WCS.Service.Works.Station
 | 
	
		
			
				|  |  |                              if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                              //暂时管控同一时间被执行的任务数为1
 | 
	
		
			
				|  |  | -                            if (db.Default.Set<WCS_AGVTask>().Any(v => v.Status == AGVTaskStatus.执行 && v.Station == obj.Entity.CODE)) continue;
 | 
	
		
			
				|  |  | +                            if (db.Default.Set<WCS_AGVTask>().Any(v => v.Status == AGVTaskStatus.执行 && v.Station == obj.Entity.CODE && v.ID != agvtask.ID)) continue;
 | 
	
		
			
				|  |  |                              agvtask.Status = AGVTaskStatus.执行;
 | 
	
		
			
				|  |  |                              agvtask.UpdateTime = DateTime.Now;
 | 
	
		
			
				|  |  |                              db.Default.SaveChanges();
 | 
	
	
		
			
				|  | @@ -128,7 +128,6 @@ namespace WCS.Service.Works.Station
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          protected override bool SelectDevice(WCS_DEVICE dev)
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  | -            //return dev.CODE == "G1386" || dev.CODE == "G1394";
 | 
	
		
			
				|  |  |              return dev.CODE == "G1386";
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 |