| 
					
				 | 
			
			
				@@ -287,7 +287,6 @@ namespace WCS.WorkEngineering.Systems 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                               && arrIn.Select(p => p.Data.TaskNumber).Contains(v.ID)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //按条件先后排序获取一条排序后第一条结果1.优先级2.所在楼层与本次优先执行楼层 TODO:待验证排序结果 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     var task = tasks.OrderByDescending(v => v.Priority).OrderByDescending(v => v.Floor == floor ? 1 : 0).First() ?? throw new KnownException($"{obj.Entity.Code}未找到入库任务", LogLevelEnum.High); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    WCS_TaskOld taskOld = db.Default.Queryable<WCS_TaskOld>().SplitTable(tabs => tabs.Take(2)).Where(v => v.ID == task.ID).OrderByDescending(v => v.AddTime).First(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //获取任务所有设备 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     station = arrIn.First(v => v.Data.TaskNumber == task.ID); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -300,9 +299,7 @@ namespace WCS.WorkEngineering.Systems 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     task.EditWho = "WCS"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     db.Default.Updateable(task).ExecuteCommand(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     task.AddWCS_TASK_DTL(db, station.Entity.Code, task.AddrTo, "任务下发堆垛机执行"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    //货位更新到历史表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    taskOld.AddrTo = $"{loc[0]}-{loc[1]}-{loc[2]}"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    db.Default.Updateable(taskOld).ExecuteCommand(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     taskInfo = task; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |