Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14319 -r14321
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14319)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14321)
@@ -3849,6 +3849,7 @@
 		if(CollectionUtils.isEmpty(tousseItemList)){
 			return invoiceItemSet;
 		}
+		Long invoicePlanId = invoicePlan.getId();
 		Set<TousseInstance> invoiceTousseInstanceSet = new HashSet<TousseInstance>();
 		Set<TousseInstance> tousseInstancesToUpdate = submitInvoiceContext.getTousseInstancesToUpdate();
 		Map<String, InvoiceItem> tousseNameToInvoiceItemMap = new HashMap<String, InvoiceItem>();
@@ -3884,6 +3885,9 @@
 					if(!applicationTousseItemId.equals(tousseItem.getId())){
 						continue;
 					}
+					if(!invoicePlanId.equals(tousseInstance.getInvoicePlanID())){
+						continue;
+					}
 					if(tousseInstance.getTousseFixedBarcode()){
 						throw new RuntimeException("可追溯的外部代理灭菌包不能扫描固定条码!");
 					}
@@ -3894,6 +3898,9 @@
 					}
 					if(!tousseInstance.getTousseFixedBarcode()){
 //						throw new RuntimeException("不可追溯的外部代理灭菌包只能扫描固定条码!");// 不追溯的包，也可以扫单个条码去发货
+						if(!invoicePlanId.equals(tousseInstance.getInvoicePlanID())){
+							continue;
+						}
 						tousseInstanceList.add(tousseInstance);
 					}else{
 						int awaitSendAmount = getAwaitSendAmount(tousseItem);