Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14238 -r14260
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14238)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14260)
@@ -1260,17 +1260,20 @@
 			}
 		}
 	}
-	// 优化速度改为批量获取器械包实例以及对应的包定义
+	/**
+	 * 优化速度改为批量获取器械包实例以及对应的包定义
+	 * @param submitInvoiceContext
+	 */
 	private void lockTousseInstances2(
 			SubmitInvoiceContext submitInvoiceContext) {
 		Map<String, TousseInstance> barcodeTousseInstanceMap = submitInvoiceContext.getBarcodeToTousseInstanceMap();
 		Map<Long, TousseInstance> idToTousseInstanceMap = submitInvoiceContext.getIdToTousseInstanceMap();
 		Set<String> barcodesScanned = submitInvoiceContext.getScannedBarcodes();
-		String barcodes = SqlUtils
-				.joinToWhereInConditionForStringProperties(barcodesScanned);
-		String tousseSql = String.format(
-				" where po.id in(select t.tousseDefinition.id from %s t where %s)", TousseInstance.class.getSimpleName(),SqlUtils.getStringFieldInCollectionsPredicate("t.barcode", barcodesScanned));
-		List tousseDefinitionList = objectDao.findBySql(TousseDefinition.class.getSimpleName(), tousseSql);
+//		String barcodes = SqlUtils
+//				.joinToWhereInConditionForStringProperties(barcodesScanned);
+//		String tousseSql = String.format(
+//				" where po.id in(select t.tousseDefinition.id from %s t where %s)", TousseInstance.class.getSimpleName(),SqlUtils.getStringFieldInCollectionsPredicate("t.barcode", barcodesScanned));
+//		List tousseDefinitionList = objectDao.findBySql(TousseDefinition.class.getSimpleName(), tousseSql);
 		
 		String tousseInstancesIdsSql = String.format(
 				" where %s", SqlUtils.getStringFieldInCollectionsPredicate("po.barcode", barcodesScanned));
@@ -1285,7 +1288,11 @@
 			submitInvoiceContext.getScannedTousseInstances().addAll(tousseInstanceList);
 		}
 	}
-	// 获取所有的条码
+	/**
+	 * 获取所有的条码
+	 * @param submitInvoiceItems
+	 * @param submitInvoiceContext
+	 */
 	private void getBarcodes(List<SubmitInvoiceItem> submitInvoiceItems,SubmitInvoiceContext submitInvoiceContext) {
 		Set<String> scannedBarcodes = submitInvoiceContext.getScannedBarcodes();
 		for (SubmitInvoiceItem submitInvoiceItem : submitInvoiceItems) {
@@ -1495,7 +1502,7 @@
 		}
 		return invoicePlanIDs;
 	}
-	// 做了并发控制的发货 TODO ，还需要优化处理的流程
+	
 	public void submitInvoice(JSONObject params) {
 		try {
 			String assistantSender = params.optString("assistantSender");