|  | @@ -260,11 +260,11 @@ public class SpringCronTask implements SchedulingConfigurer{
 | 
											
												
													
														|  |  					 hs.put("clock",dateForm.format(calendar.getTime()));
 |  |  					 hs.put("clock",dateForm.format(calendar.getTime()));
 | 
											
												
													
														|  |  					 calendar.set(Calendar.HOUR_OF_DAY,24*6);
 |  |  					 calendar.set(Calendar.HOUR_OF_DAY,24*6);
 | 
											
												
													
														|  |  					 hs.put("clocke", dateForm.format(calendar.getTime()));
 |  |  					 hs.put("clocke", dateForm.format(calendar.getTime()));
 | 
											
												
													
														|  | -					 tRmWorkprocProductValueService.getReportProductValue(hs);
 |  | 
 | 
											
												
													
														|  | -					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
 |  | 
 | 
											
												
													
														|  |  					 //根据报表中的产量数据生成
 |  |  					 //根据报表中的产量数据生成
 | 
											
												
													
														|  |  					 hs.put("useflag", "1");
 |  |  					 hs.put("useflag", "1");
 | 
											
												
													
														|  |  					 tRmWorkprocProductValueService.getReportValue(hs);
 |  |  					 tRmWorkprocProductValueService.getReportValue(hs);
 | 
											
												
													
														|  | 
 |  | +					 tRmWorkprocProductValueService.getReportProductValue(hs);
 | 
											
												
													
														|  | 
 |  | +					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
 | 
											
												
													
														|  |  					logger.info("定时任务"+taskId+"执行时长:" + (System.currentTimeMillis() - start)/1000 + "秒");
 |  |  					logger.info("定时任务"+taskId+"执行时长:" + (System.currentTimeMillis() - start)/1000 + "秒");
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
												
													
														|  |  				else if (taskId.equalsIgnoreCase("119")) {
 |  |  				else if (taskId.equalsIgnoreCase("119")) {
 |