Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java =================================================================== diff -u -r37962 -r37964 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java (.../InvoiceItemManagerImpl.java) (revision 37962) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java (.../InvoiceItemManagerImpl.java) (revision 37964) @@ -122,11 +122,11 @@ } InvoiceItem invoiceItem = disposableGoodsInvoiceItemMap.get(dgi.getInvoiceItemID()); Integer amount = dgi.getAmount(); - Integer transferScale = null; - if(invoiceItem != null){ - transferScale = invoiceItem.getTransferScale(); - } - Integer middlePackageUnitAmount = DisposableGoodsUtils.amountToAppAmountNotThrowException(transferScale, amount , RoundingMode.UP); +// Integer transferScale = null; +// if(invoiceItem != null){ +// transferScale = invoiceItem.getTransferScale(); +// } +// Integer middlePackageUnitAmount = DisposableGoodsUtils.amountToAppAmountNotThrowException(transferScale, amount , RoundingMode.UP); InvoiceItemSummaryVo find = InvoiceItemSummaryVo.find(vos, dgi); if(find == null){ find = new InvoiceItemSummaryVo(); @@ -145,7 +145,7 @@ vos.add(find); } find.setAmount(MathTools.add(find.getAmount(), amount).intValue()); - find.setMiddlePackageUnitAmount(MathTools.add(find.getMiddlePackageUnitAmount(), middlePackageUnitAmount).intValue()); + //find.setMiddlePackageUnitAmount(MathTools.add(find.getMiddlePackageUnitAmount(), middlePackageUnitAmount).intValue()); } } } @@ -154,6 +154,13 @@ int index = 1; for(InvoiceItemSummaryVo vo : vos){ vo.setIndex(index++); + // 设置申领单位数量 + Integer transferScale = vo.getTransferScale(); + if(DisposableGoodsUtils.isMiddlePackageUnitEnabled(transferScale)){ + Integer amount = vo.getAmount(); + Integer appAmount = DisposableGoodsUtils.amountToAppAmountNotThrowException(transferScale, amount, RoundingMode.UP); + vo.setMiddlePackageUnitAmount(appAmount); + } } return vos; }