Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r29120 -r29121 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29120) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29121) @@ -3266,7 +3266,7 @@ PrintRowVo printRowVo = tousseItem2PrintVo(tousseItems.get(i), printApplyInfo, invoiceOrigin, afterRecyclingTousseDeliver, printDisinfectionGoodsAmountByPackage); if(mergeSameGoods){ PrintRowVo rowVo = find(rowVos,tousseItems.get(i).getAncestorID()); - if(rowVo != null && printRowVo != null&&!tousseItems.get(i).disposable()){ + if(rowVo != null && printRowVo != null){ rowVo.setApplyAmount(MathTools.add(rowVo.getApplyAmount(), printRowVo.getApplyAmount()).intValue()); rowVo.setGoodsAmount(MathTools.add(rowVo.getGoodsAmount(), printRowVo.getGoodsAmount()).intValue()); rowVo.setRecyclingAmount(MathTools.add(rowVo.getRecyclingAmount(), printRowVo.getRecyclingAmount()).intValue());