Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14812 -r14841 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14812) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14841) @@ -1176,29 +1176,29 @@ if (printSummaryList.size() >0){ int pageAmount = 0; for (PrintSummaryVo summary: printSummaryList){ - summary.setTotalPrice(0.0); - if(CollectionUtils.isNotEmpty(summary.getPages())){ - for(PrintPageVo ppv:summary.getPages()){ - if(CollectionUtils.isNotEmpty(ppv.getRows())){ - for(PrintRowVo prv:ppv.getRows()){ - //默认数量为申请数量,如果为回收申请单,则取回收数量 - int amount = prv.getApplyAmount(); - if(DatabaseUtil.isPoIdValid(prv.getApplicationId())){ - //取到申请单对象(如果不是回收申请单数量取申请数量、否则取回收数量) - RecyclingApplication recyclingApplication = - recyclingApplicationManager.getRecyclingApplicationById(prv.getApplicationId()); - if(recyclingApplication != null - && InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(recyclingApplication.getType())){ - amount = prv.getRecyclingAmount(); - } - } - BigDecimal bg = MathTools.mul(amount, prv.getPrice()); - prv.setRowPrice(bg == null ? 0.0 : bg.doubleValue()); - summary.setTotalPrice(summary.getTotalPrice() + prv.getRowPrice()); - } - } - } - } +// summary.setTotalPrice(0.0); +// if(CollectionUtils.isNotEmpty(summary.getPages())){ +// for(PrintPageVo ppv:summary.getPages()){ +// if(CollectionUtils.isNotEmpty(ppv.getRows())){ +// for(PrintRowVo prv:ppv.getRows()){ +// //默认数量为申请数量,如果为回收申请单,则取回收数量 +// int amount = prv.getApplyAmount(); +// if(DatabaseUtil.isPoIdValid(prv.getApplicationId())){ +// //取到申请单对象(如果不是回收申请单数量取申请数量、否则取回收数量) +// RecyclingApplication recyclingApplication = +// recyclingApplicationManager.getRecyclingApplicationById(prv.getApplicationId()); +// if(recyclingApplication != null +// && InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(recyclingApplication.getType())){ +// amount = prv.getRecyclingAmount(); +// } +// } +// BigDecimal bg = MathTools.mul(amount, prv.getPrice()); +// prv.setRowPrice(bg == null ? 0.0 : bg.doubleValue()); +// summary.setTotalPrice(summary.getTotalPrice() + prv.getRowPrice()); +// } +// } +// } +// } pageAmount += summary.getPageAmount(); }