Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r18474 -r18476
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 18474)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 18476)
@@ -2113,9 +2113,9 @@
 		}
 		Set<String> status = new HashSet<String>();
 		status.add(TousseInstance.STATUS_SHIPPED);
-		status.add(TousseInstance.STATUS_DISCARD);
+//		status.add(TousseInstance.STATUS_DISCARD);
 		// 查询包实例
-		String sql = String.format(" where %s and %s", SqlUtils.getNonStringFieldInCollectionsPredicate("po.foreignTousseApp_id", invoicedForeignTousseAppliactionIdSet),
+		String sql = String.format(" where %s and %s and po.insteadTiBarcode is null ", SqlUtils.getNonStringFieldInCollectionsPredicate("po.foreignTousseApp_id", invoicedForeignTousseAppliactionIdSet),
 				SqlUtils.getStringFieldNotInCollectionsPredicate("po.status", status));
 		List list = objectDao.findBySql(TousseInstance.class.getSimpleName(), sql);
 		if(list != null && list.size() > 0){
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r18474 -r18476
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 18474)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 18476)
@@ -1317,9 +1317,10 @@
 	public List<TousseInstance> getToussInstanceByForeignTousseApplicationIdForInvoice(Long id){
 		if (id != null) {
 			try {
-				Set<String> status = new HashSet<String>();
-				status.add(TousseInstance.STATUS_STERILED);
-				String sql = String.format("where po.foreignTousseApp_id = %s and %s ", id,SqlUtils.getStringFieldInCollectionsPredicate("po.status", status));
+//				Set<String> status = new HashSet<String>();
+//				status.add(TousseInstance.STATUS_STERILED);
+//				String sql = String.format("where po.foreignTousseApp_id = %s and %s ", id,SqlUtils.getStringFieldInCollectionsPredicate("po.status", status));
+				String sql = String.format("where po.foreignTousseApp_id = %s and po.insteadTiBarcode is null ", id);
 				return objectDao.findBySql(
 						TousseInstance.class.getSimpleName(), sql);
 			} catch (Exception e) {