|  | @@ -872,11 +872,11 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 | 
											
												
													
														|  |  					if(tRmCalpoint!=null && tRmCalpoint.getCalcMod()!=null && "FLOAT".equals(tRmCalpoint.getCalcMod())){
 |  |  					if(tRmCalpoint!=null && tRmCalpoint.getCalcMod()!=null && "FLOAT".equals(tRmCalpoint.getCalcMod())){
 | 
											
												
													
														|  |  						if(tRmCalpoint.getRangeVal()!=null){
 |  |  						if(tRmCalpoint.getRangeVal()!=null){
 | 
											
												
													
														|  |  							int max = new BigDecimal(dval).divide(tRmCalpoint.getRangeVal(),0,BigDecimal.ROUND_HALF_UP).intValue();
 |  |  							int max = new BigDecimal(dval).divide(tRmCalpoint.getRangeVal(),0,BigDecimal.ROUND_HALF_UP).intValue();
 | 
											
												
													
														|  | -							int min = new BigDecimal(dval).multiply(tRmCalpoint.getRangeVal()).setScale(1,BigDecimal.ROUND_HALF_UP).intValue();
 |  | 
 | 
											
												
													
														|  | 
 |  | +							int min = new BigDecimal(dval).multiply(tRmCalpoint.getRangeVal()).setScale(0,BigDecimal.ROUND_HALF_UP).intValue();
 | 
											
												
													
														|  |  							//求差
 |  |  							//求差
 | 
											
												
													
														|  |  							int mid = max - min;
 |  |  							int mid = max - min;
 | 
											
												
													
														|  |  							//产生随机数
 |  |  							//产生随机数
 | 
											
												
													
														|  | -							acb = new BigDecimal(Math.random() * (mid + 1) + min).setScale(digits,BigDecimal.ROUND_HALF_UP);
 |  | 
 | 
											
												
													
														|  | 
 |  | +							acb = new BigDecimal(new Random().nextInt(max)%(mid+1) + min).setScale(digits,BigDecimal.ROUND_HALF_UP);
 | 
											
												
													
														|  |  						}
 |  |  						}
 | 
											
												
													
														|  |  					}
 |  |  					}
 | 
											
												
													
														|  |  
 |  |  
 |