Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java =================================================================== diff -u -r37029 -r37523 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java (.../MonthGoodsDetailSummaryService.java) (revision 37029) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java (.../MonthGoodsDetailSummaryService.java) (revision 37523) @@ -88,8 +88,8 @@ }else if(GodownEntry.SUBTYPE_MANUAL_OUT.equals(subType) || GodownEntry.SUBTYPE_SYNC_OUT.equals(subType)){ //这种情况下,记入入库合计,但数值是负数 - /*type=GodownEntry.TYPE_IN; - amount = - amount;*/ + type=GodownEntry.TYPE_IN; + amount = - amount; vo.setReturnBackToSupplierStorageAmount( MathTools.add(amount,vo.getReturnBackToSupplierStorageAmount()).longValue()); vo.setReturnBackToSupplierStoragePrice( @@ -121,8 +121,8 @@ MathTools.add(amount * cost, vo.getSendOutStoragePrice()).doubleValue()); }else if("科室退货".equals(subType)){ //记入出库合计,数量为负 - /*type=GodownEntry.TYPE_OUT; - amount = - amount;*/ + type=GodownEntry.TYPE_OUT; + amount = - amount; vo.setDepartmentReturnStorageAmount( MathTools.add(amount,vo.getDepartmentReturnStorageAmount()).longValue()); vo.setDepartmentReturnStoragePrice(