| 
					
				 | 
			
			
				@@ -896,6 +896,9 @@ namespace wms.service.Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var res = new SRes(){ResCode = ResponseStatusCodeEnum.Fail.GetHashCode(),ResMsg = "失败"}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            var taskMax = Convert.ToInt32(_sysconfigrepository.AsQueryable().With(SqlWith.NoLock).First(x => x.Code == "FullPalletInMax").SContent); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            var taskCount = _taskrepository.AsQueryable().With(SqlWith.NoLock).Count(x => x.BusType == FJTaskBusType.人工满托入库.GetDescription() && x.Status < TaskStatus.Finish); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (string.IsNullOrEmpty(reqDto.LocCode)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 res.ResCode = ResponseStatusCodeEnum.Fail.GetHashCode(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1088,7 +1091,16 @@ namespace wms.service.Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //创建对应任务 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 var count_1N = invnowCount_1N + taskInfoCount_1N; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 var count_2N = invnowCount_2N + taskInfoCount_2N; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                var wCode = (count_1N <= count_2N) ? "1N" : "2N"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (taskMax > 0 && taskCount > 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if ((wCode == "1N" && taskMax <= taskInfoCount_1N) || (wCode == "2N" && taskMax <= taskInfoCount_2N)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        res.ResCode = ResponseStatusCodeEnum.Fail.GetHashCode(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        res.ResMsg = $"禁止入库,最大入库任务数量已达{taskMax}"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        return res; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    }                    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //创建入库记录 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 var createStockInWcsTaskReqest = new FJCreateStockInWcsTaskRequest 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1101,7 +1113,7 @@ namespace wms.service.Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     Type = TaskType.EnterDepot, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     DocCode = "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     WorkBench = task.WorkBench, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    WarehouseCode = (count_1N <= count_2N) ? "1N" : "2N", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    WarehouseCode = wCode/*(count_1N <= count_2N) ? "1N" : "2N"*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //下发wcs任务 - 分解方法 
			 |