| 
					
				 | 
			
			
				@@ -424,16 +424,16 @@ public class WmsInboundScanResultController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed("请输入仓库id"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Integer number=Integer.parseInt(map.get("number").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String userName=map.get("userName").toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(number<=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed("数量错误,结束"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //创建扫描实绩 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Map<String,Object>> resultMaterials=wmsInboundScanResultService.createResultMaterials(map);//创建吊牌 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         wmsInboundScanResultService.createInboundScanResultByFind(resultMaterials,map);//新增扫描实绩 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<Map<String,Object>> inboundScans=wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());//查询入库扫描实绩 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<Map<String,Object>> inboundScans=wmsInboundScanResultService.noIssueScanResultList(userName);//查询入库扫描实绩 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //创建入库实绩 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String userName=map.get("userName").toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        BigDecimal groupId=new BigDecimal(2),personnelWorkshopid=DataChange.dataToBigDecimal("warehouseId"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        BigDecimal groupId=new BigDecimal(2),personnelWorkshopid=DataChange.dataToBigDecimal(map.get("warehouseId").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return inboundResultController.addInvoice(userName,groupId,personnelWorkshopid,inboundScans,"物流系统补录"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |