| 
					
				 | 
			
			
				@@ -82,7 +82,7 @@ namespace WCS.Service.Works.Station 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var code = obj.Entity.CODE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //当前组有一个运行的设备就停止执行 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (obj.WhetherToExecute(IstationRequest.请求分配目标地址)) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (obj.WhetherToExecute()) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //获取需要进行巷道分配的设备 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var devs = obj.TaskedDeviceGetNextAddress() ?? throw new Exception(LogHelper.SpliceLogMessage("无可用任务", obj.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常, GetType())); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -125,8 +125,8 @@ namespace WCS.Service.Works.Station 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 foreach (var dev in devs) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     var task = tasks.FirstOrDefault(p => p.ID == dev.Data2.Tasknum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if ((task.TaskGroupKey.Contains($"{task.WMSTASK}_") || task.TaskGroupKey.Contains($"_{task.WMSTASK}")) && dev.Data2.Goodsend == task.ADDRNEXT.ToShort()) continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (dev.Data2.Request != IstationRequest.请求分配目标地址) continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if ((task.TaskGroupKey.Contains($"{task.WMSTASK}_") || task.TaskGroupKey.Contains($"_{task.WMSTASK}"))) continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (dev.Data2.Goodsend != task.ADDRNEXT.ToShort()) continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     dev.Data.Tasknum = task.ID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     dev.Data.Goodsstart = Conv_1030.ToShort(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     dev.Data.Goodsend = tunnelInfo.taskIN.CODE.Replace("G", "").ToShort(); 
			 |