Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r30196 -r30212 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30196) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30212) @@ -5850,7 +5850,9 @@ item.setExternalCode(tousseExternalCodeMap.get(tousseName)); tmpMap.put(tousseName, item); } - item.setMaterialAmount(item.getMaterialAmount() + dmi.getMaterialAmount()); + if(dmi.getMaterialAmount() != null){ + item.setMaterialAmount(MathTools.add(item.getMaterialAmount(), dmi.getMaterialAmount()).intValue()); + } item.setAmount(item.getAmount()+dmi.getAmount()); item.setBatchNumber(dmi.getBatchNumber()); item.setDiposable(dmi.getDiposable()); @@ -5871,7 +5873,9 @@ item.setAmount(item.getAmount()+dmi.getAmount()); item.setDiposable(dmi.getDiposable()); item.setGoodsName(tousseName); - item.setMaterialAmount(item.getMaterialAmount() + dmi.getMaterialAmount()); + if(dmi.getMaterialAmount() != null){ + item.setMaterialAmount(MathTools.add(item.getMaterialAmount(), dmi.getMaterialAmount()).intValue()); + } item.setManufacturer(dmi.getManufacturer()); item.setSettlementPrice(item.getSettlementPrice() + dmi.getSettlementPrice()); item.setSettlementDiscountPrice(MathTools.add(item.getSettlementDiscountPrice(), dmi.getSettlementDiscountPrice()).doubleValue());