Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r13939 -r13959
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 13939)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 13959)
@@ -330,6 +330,7 @@
 					recyclingAmount = 0;
 				}
 				vo.setRecyclingAmount(recyclingAmount);
+				vo.setInvoiceAmount(item.getSendOutAmount());
 				if ("否".equals(item.getDiposable())) {
 					TousseDefinition definition = tousseDefinitionManager
 							.getTousseDefinitionByTousseItem(item);
@@ -391,42 +392,42 @@
 
 		
 		// 外来器械特殊处理，可能以后所有单都这么处理？
-		if (re.isForeignTousseAppliaction()) {
-			for (ApplicationItemVO itemVO : itemVOs) {
-				for (TousseItem item : applicationItems) {
-					if (StringUtils.equals(item.getTousseName(),
-							itemVO.getName())) {
-						itemVO.setInvoiceAmount(item.getSendOutAmount());
-					}
-				}
-			}
-		} else {
-			// 设置物品已发货数量
-			List<Invoice> invoiceList = re.getInvoice();
-			if (invoiceList != null) {
-				for (Invoice invoice : invoiceList) {
-					if (!Invoice.STATUS_UNDELIVERED.equals(invoice.getStatus())) {
-						Set<InvoiceItem> invoiceItem = invoice.getInvoiceItem();
-						if (invoiceItem != null) {
-							for (Iterator<InvoiceItem> 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());
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
+//		if (re.isForeignTousseAppliaction()) {
+//			for (ApplicationItemVO itemVO : itemVOs) {
+//				for (TousseItem item : applicationItems) {
+//					if (StringUtils.equals(item.getTousseName(),
+//							itemVO.getName())) {
+//						itemVO.setInvoiceAmount(item.getSendOutAmount());
+//					}
+//				}
+//			}
+//		} else {
+//			// 设置物品已发货数量
+//			List<Invoice> invoiceList = re.getInvoice();
+//			if (invoiceList != null) {
+//				for (Invoice invoice : invoiceList) {
+//					if (!Invoice.STATUS_UNDELIVERED.equals(invoice.getStatus())) {
+//						Set<InvoiceItem> invoiceItem = invoice.getInvoiceItem();
+//						if (invoiceItem != null) {
+//							for (Iterator<InvoiceItem> 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