|  | @@ -58,9 +58,9 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 | 
												
													
														
															|  |  	public String  save(String type) {
 |  |  	public String  save(String type) {
 | 
												
													
														
															|  |  		ReportNum reportNum = null;
 |  |  		ReportNum reportNum = null;
 | 
												
													
														
															|  |  		int count = projectReportNumDao.countNum(UserUtils.getUser().getId());
 |  |  		int count = projectReportNumDao.countNum(UserUtils.getUser().getId());
 | 
												
													
														
															|  | -		if(count>=10){
 |  | 
 | 
												
													
														
															|  | 
 |  | +		/*if(count>=10){
 | 
												
													
														
															|  |  			return "最多领取10个报告号";
 |  |  			return "最多领取10个报告号";
 | 
												
													
														
															|  | -		}
 |  | 
 | 
												
													
														
															|  | 
 |  | +		}*/
 | 
												
													
														
															|  |  		if(type.equals("one")){
 |  |  		if(type.equals("one")){
 | 
												
													
														
															|  |  			String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
 |  |  			String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
 | 
												
													
														
															|  |  			reportNum = new ReportNum();
 |  |  			reportNum = new ReportNum();
 | 
												
											
												
													
														
															|  | @@ -102,9 +102,9 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 | 
												
													
														
															|  |  	@Transactional(readOnly = false)
 |  |  	@Transactional(readOnly = false)
 | 
												
													
														
															|  |  	public String  saveReportNumOnStage(ReportNum reportNum) {
 |  |  	public String  saveReportNumOnStage(ReportNum reportNum) {
 | 
												
													
														
															|  |  		int count = projectReportNumDao.getCountNum(UserUtils.getUser().getId(),reportNum.getNum());
 |  |  		int count = projectReportNumDao.getCountNum(UserUtils.getUser().getId(),reportNum.getNum());
 | 
												
													
														
															|  | -		if(count>=10){
 |  | 
 | 
												
													
														
															|  | 
 |  | +		/*if(count>=10){
 | 
												
													
														
															|  |  			return "最多领取10个报告号";
 |  |  			return "最多领取10个报告号";
 | 
												
													
														
															|  | -		}
 |  | 
 | 
												
													
														
															|  | 
 |  | +		}*/
 | 
												
													
														
															|  |  		reportNum.setNum(reportNum.getNum()+"-"+reportNum.getStageId()+"-");
 |  |  		reportNum.setNum(reportNum.getNum()+"-"+reportNum.getStageId()+"-");
 | 
												
													
														
															|  |  		reportNum.setCreateBy(UserUtils.getUser());
 |  |  		reportNum.setCreateBy(UserUtils.getUser());
 | 
												
													
														
															|  |  		//获取最后一个报告号数据信息
 |  |  		//获取最后一个报告号数据信息
 |