Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r13875 -r13877
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13875)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13877)
@@ -1321,6 +1321,7 @@
 						tousseInstance);
 				idToTousseInstanceMap.put(tousseInstance.getId(), tousseInstance);
 			}
+			submitInvoiceContext.getScannedTousseInstances().addAll(tousseInstanceList);
 		}
 	}
 	// 获取所有的条码
@@ -3739,6 +3740,7 @@
 		ProxyDisinfection proxyDisinfection = (ProxyDisinfection) invoicePlan;
 		Map<String, TousseItem> tousseItemMap = new HashMap<String, TousseItem>();
 		Map<String, InvoiceItem> invoiceItemMap = new HashMap<String, InvoiceItem>();
+		
 		for (TousseItem tousseItem : invoicePlan.getApplicationItems()) {
 			if(tousseItem.terminated()){// 对终止状态的处理
 				continue;
@@ -3807,6 +3809,8 @@
 		Map<String, BarcodeDevice> barcodeObjMap = submitInvoiceContext.getBarcodeToBarcodeDeviceMap();
 		Set<InvoiceItem> invoiceItemSet = new HashSet<InvoiceItem>();
 		List<TousseItem> tousseItemList = invoicePlan.getApplicationItems();
+		Set<TousseInstance> scannedTousseInstances = submitInvoiceContext.getScannedTousseInstances();
+		
 		if(CollectionUtils.isEmpty(tousseItemList)){
 			return invoiceItemSet;
 		}
@@ -3837,6 +3841,7 @@
 				}
 				int actualSendAmount = 1;
 				List<TousseInstance> tousseInstanceList = new LinkedList<TousseInstance>();
+				
 				if(isTraceable){
 					if(applicationTousseItemId == null){
 						continue;
@@ -3853,44 +3858,49 @@
 						continue;
 					}
 					if(!tousseInstance.getTousseFixedBarcode()){
-						throw new RuntimeException("不可追溯的外部代理灭菌包只能扫描固定条码!");
-					}
-					int awaitSendAmount = getAwaitSendAmount(tousseItem);
-					if(awaitSendAmount == 0){
-						continue;
-					}
-
-					// 未发货数量
-					Integer scannedAmount = sendOutBarcodeAmountMap.get(tousseInstance.getBarcode());
-					if (scannedAmount == null || scannedAmount <= 0) {
-						continue;
-					}
-
-					actualSendAmount = Math.min(scannedAmount, awaitSendAmount);// 能发货的数量
-					// 非可追溯器械包，返回多个器械包实例
-					List<TousseInstance> affiliatedTousseInstanceList = (List<TousseInstance>)getCanInvoiceTousseInstancesByFixedTousseInstance(tousseInstance);
-					if (CollectionUtils.isEmpty(affiliatedTousseInstanceList) || affiliatedTousseInstanceList.size() < actualSendAmount){
-						throw new RuntimeException(String.format("物品%s库存不足", tousseInstance.getTousseName()));
-					}
-					
-					for (TousseInstance tousse : affiliatedTousseInstanceList) {
-						if(!tousse.canInvoice()){
+//						throw new RuntimeException("不可追溯的外部代理灭菌包只能扫描固定条码!");// 不追溯的包，也可以扫单个条码去发货
+						tousseInstanceList.add(tousseInstance);
+					}else{
+						int awaitSendAmount = getAwaitSendAmount(tousseItem);
+						if(awaitSendAmount == 0){
 							continue;
 						}
-						if(invoiceTousseInstanceSet.contains(tousse)){
+
+						// 未发货数量
+						Integer scannedAmount = sendOutBarcodeAmountMap.get(tousseInstance.getBarcode());
+						if (scannedAmount == null || scannedAmount <= 0) {
 							continue;
 						}
-						tousseInstanceList.add(tousse);
-						if(tousseInstanceList.size() == actualSendAmount){
-							break;
+
+						actualSendAmount = Math.min(scannedAmount, awaitSendAmount);// 能发货的数量
+						// 非可追溯器械包，返回多个器械包实例
+						List<TousseInstance> affiliatedTousseInstanceList = (List<TousseInstance>)getCanInvoiceTousseInstancesByFixedTousseInstance(tousseInstance);
+						if (CollectionUtils.isEmpty(affiliatedTousseInstanceList) || affiliatedTousseInstanceList.size() < actualSendAmount){
+							throw new RuntimeException(String.format("物品%s库存不足", tousseInstance.getTousseName()));
 						}
+						
+						for (TousseInstance tousse : affiliatedTousseInstanceList) {
+							if(!tousse.canInvoice()){
+								continue;
+							}
+							if(invoiceTousseInstanceSet.contains(tousse)){
+								continue;
+							}
+							if(scannedTousseInstances.contains(tousse)){
+								continue;
+							}
+							tousseInstanceList.add(tousse);
+							if(tousseInstanceList.size() == actualSendAmount){
+								break;
+							}
+						}
+						if (tousseInstanceList.size() < actualSendAmount){
+							throw new RuntimeException(String.format("物品%s库存不足", tousseInstance.getTousseName()));
+						}
+					
+						scannedAmount -= actualSendAmount;
+						sendOutBarcodeAmountMap.put(tousseInstance.getBarcode(), scannedAmount);
 					}
-					if (tousseInstanceList.size() < actualSendAmount){
-						throw new RuntimeException(String.format("物品%s库存不足", tousseInstance.getTousseName()));
-					}
-				
-					scannedAmount -= actualSendAmount;
-					sendOutBarcodeAmountMap.put(tousseInstance.getBarcode(), scannedAmount);
 				}
 				invoiceTousseInstanceSet.addAll(tousseInstanceList);
 				tousseInstancesToUpdate.addAll(tousseInstanceList);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
===================================================================
diff -u -r13855 -r13877
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 13855)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 13877)
@@ -39,6 +39,7 @@
 	private Set<String> scannedBarcodes = new HashSet<String>();
 	private Map<Invoice,Collection<TousseInstance>> updateStockInfo = new HashMap<Invoice, Collection<TousseInstance>>();
 	private List<Invoice> invoiceList = new LinkedList<Invoice>();
+	private Set<TousseInstance> scannedTousseInstances = new HashSet<TousseInstance>();
 	private Set<TousseInstance> tousseInstancesToUpdate = new HashSet<TousseInstance>();
 	private Map<String, Integer> sendOutGoodsNameToAmountMap = new HashMap<String, Integer>();
 	private Map<String, Integer> sendOutBarcodeToAmountMap = new HashMap<String, Integer>();
@@ -142,6 +143,14 @@
 		this.invoiceList = invoiceList;
 	}
 
+	public Set<TousseInstance> getScannedTousseInstances() {
+		return scannedTousseInstances;
+	}
+
+	public void setScannedTousseInstances(Set<TousseInstance> scannedTousseInstances) {
+		this.scannedTousseInstances = scannedTousseInstances;
+	}
+
 	public Set<TousseInstance> getTousseInstancesToUpdate() {
 		return tousseInstancesToUpdate;
 	}