Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r21384 -r21385 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 21384) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 21385) @@ -782,45 +782,6 @@ itemVOs.add(vo); } } - - - // 外来器械特殊处理,可能以后所有单都这么处理? -// if (re.isForeignTousseAppliaction()) { -// for (ApplicationItemVO itemVO : itemVOs) { -// for (TousseItem item : applicationItems) { -// if (StringUtils.equals(item.getTousseName(), -// itemVO.getName())) { -// itemVO.setInvoiceAmount(item.getSendOutAmount()); -// } -// } -// } -// } else { -// // 设置物品已发货数量 -// List invoiceList = re.getInvoice(); -// if (invoiceList != null) { -// for (Invoice invoice : invoiceList) { -// if (!Invoice.STATUS_UNDELIVERED.equals(invoice.getStatus())) { -// Set invoiceItem = invoice.getInvoiceItem(); -// if (invoiceItem != null) { -// for (Iterator invoiceIt = invoiceItem -// .iterator(); invoiceIt.hasNext();) { -// InvoiceItem item = invoiceIt.next(); -// for (ApplicationItemVO itemVO : itemVOs) { -// if (item.getTousseName().equals( -// itemVO.getName())) { -// if (item.getAmount() != null) { -// itemVO.setInvoiceAmount(itemVO -// .getInvoiceAmount() -// + item.getAmount()); -// } -// } -// } -// } -// } -// } -// } -// } -// } } @Override Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r21313 -r21385 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21313) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21385) @@ -3103,11 +3103,12 @@ tousseItem.setAmount(0); tousseItem.setExpressInvoice(newItemVo.getExpressInvoice()); //是否快速发货 - //设置一次性物品的类型 + //设置一次性物品的类型和语音提示名称 if (DatabaseUtil.isPoIdValid(disposableGoodsId)) { DisposableGoods disposableGoods = diposableGoodsManager.get(disposableGoodsId); if (disposableGoods != null) { tousseItem.setDisposableGoodsType(disposableGoods.getType()); + tousseItem.setTtsName(disposableGoods.getTtsName()); } } @@ -5406,6 +5407,7 @@ tousseItem.setInvoicePlan(invoicePlan); tousseItem.setInvoicePlanID(invoicePlan.getId()); tousseItem.setDisposableGoodsType(disposableGoods.getType()); //一次性物品类型 + tousseItem.setTtsName(disposableGoods.getTtsName()); //语音提示名称 tousseItem.setExpressInvoice(disposableGoods.getExpressInvoice()); //是否快速发货 applicationItems.add(tousseItem);