Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r27394 -r27469
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 27394)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 27469)
@@ -1813,6 +1813,7 @@
 	
 	/**
 	 * 根据传入的条码/虚拟篮筐编号加载相关符合发货条件的器械包
+	 * (发货计划发货、自定义发货、手术预约发货、手术预约汇总发货、高值耗材发货扫描条码时调用此action方法)
 	 * request params:
 	 * 1.barcode 条码或条码段;虚拟篮筐或篮筐段
 	 * 2.saveBarcodeStr 待发货的表格的条码串,用分号拼起来
@@ -1839,11 +1840,7 @@
 		
 		
 		try {
-			JsonObject result = null;
-			if(StringUtils.equals(invoiceType, Invoice.TYPE_EXPRESS)){
-				result = expressInvoiceManager.getInfoByBarcodeForInvoiceScan(params);
-			}
-			result = invoiceManager.getInfoByBarcodeForInvoiceScan(params);
+			JsonObject result = invoiceManager.getInfoByBarcodeForInvoiceScan(params);
 			JsonElement result2 = convertResult(result);
 			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 			StrutsParamUtils.getResponse().getWriter()
@@ -1855,6 +1852,7 @@
 
 	/**
 	 * 快速发货页面根据传入的条码加载相关符合发货条件的器械包
+	 * (仅快速发货扫描条码时调用此action方法)
 	 * request params:
 	 * 1.barcode 器械包固定条码、或一次性物品批次条码
 	 * 2.tousseDefinitionId 器械包定义id