Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java =================================================================== diff -u -r13296 -r13297 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java (.../MonthGoodsDetailSummaryService.java) (revision 13296) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java (.../MonthGoodsDetailSummaryService.java) (revision 13297) @@ -37,7 +37,7 @@ public void addItem(JSONObject jsonObject){ String name = jsonObject.optString("name"); String spec = jsonObject.optString("specification"); - MonthGoodsDetailVo vo = findOrAdd(name, spec,false); + MonthGoodsDetailVo vo = findOrAdd(name, spec,true); long amount = jsonObject.optLong("amount"); double cost = jsonObject.optDouble("cost"); String type = jsonObject.optString("type"); Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml =================================================================== diff -u -r13295 -r13297 --- ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml (.../stocktakeSummaryReport.jrxml) (revision 13295) +++ ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml (.../stocktakeSummaryReport.jrxml) (revision 13297) @@ -2,7 +2,7 @@ - +