| 
					
				 | 
			
			
				@@ -771,6 +771,7 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			hs.put("clocke", dateForm.format(calendar.getTime()));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//根据报表中的产量数据生成
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			hs.put("useflag", "1");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			//this.getReportValue(hs);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			this.getMaterialValue(hs);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//endregion
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     	calendar.setTime(date);
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1084,7 +1085,6 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		HashMap<String, Object> m = new HashMap<String, Object>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		m.put("clock", today);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		m.put("clock1",yesterday);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		tRmWorkprocMaterialValueMapper.getReportValue(m);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<TRmWorkprocMaterialValue> trmlist= tRmWorkprocMaterialValueMapper.getReportValue(m);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		TRmWorkprocMaterialValue trmModel=new TRmWorkprocMaterialValue();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		for(TRmWorkprocMaterialValue trmWorkprocMaterialValue: trmlist)
 
			 |