|  | @@ -180,8 +180,8 @@ return null;
 | 
											
												
													
														|  |  		//System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
 |  |  		//System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
 | 
											
												
													
														|  |  		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds);
 |  |  		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds);
 | 
											
												
													
														|  |  		for (SyPackingListFabricItem syPackingListFabricItem : syPackingListFabricItems){
 |  |  		for (SyPackingListFabricItem syPackingListFabricItem : syPackingListFabricItems){
 | 
											
												
													
														|  | -			if(syPackingListFabricItem.getExcessQuantity()<0){
 |  | 
 | 
											
												
													
														|  | -				syPackingListFabricItem.setExcessQuantity(0);//如果超发数量为-1就写为0
 |  | 
 | 
											
												
													
														|  | 
 |  | +			if(syPackingListFabricItem.getExcessQuantity().intValue()<0){
 | 
											
												
													
														|  | 
 |  | +				syPackingListFabricItem.setExcessQuantity(new BigDecimal(0));//如果超发数量为-1就写为0
 | 
											
												
													
														|  |  			}
 |  |  			}
 | 
											
												
													
														|  |  			if(syPackingListFabricItem.getVenId().indexOf("04")>-1&&!syPackingListFabricItem.getVenId().equals("0499")){
 |  |  			if(syPackingListFabricItem.getVenId().indexOf("04")>-1&&!syPackingListFabricItem.getVenId().equals("0499")){
 | 
											
												
													
														|  |  				//满足条件
 |  |  				//满足条件
 |