Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15489 -r15504
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15489)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15504)
@@ -4039,7 +4039,7 @@
 	// 发货扫描时的扫条码处理,暂时从getInfoByBarcode复制而来，还需要做进一步的优化处理
 	public JsonObject getInfoByBarcodeForInvoiceScan(JsonObject params){
 
-		String invoiceType = JSONUtil.optString(params, "invoiceType", Invoice.TYPE_APPLICATION);
+		
 //		switch(invoiceType){
 //		case Invoice.TYPE_OPERATION_RESERVATION:
 //			return getInfoByBarcodeForOperationReservationInvoiceScan(params);
@@ -4054,7 +4054,7 @@
 				.getAsJsonObject();
 		if (extraParam == null)
 			return buildErrorMsgJsonResult("缺失参数extraParam");
-
+		String invoiceType = JSONUtil.optString(extraParam, "invoiceType", Invoice.TYPE_APPLICATION);
 		final String mode = GsonUtil.getString(extraParam, "mode", "");
 		final String departCodeOfInvoicePlan = GsonUtil.getString(extraParam, "departCodeOfInvoicePlan", "");
 		final long invoicePlanId = GsonUtil.getLong(extraParam, "invoicePlanId", 0);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15489 -r15504
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15489)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15504)
@@ -1330,13 +1330,15 @@
 		extraParam.addProperty("mode", "depart");
 		extraParam.addProperty("departCodeOfInvoicePlan", orgUnitCoding);
 		extraParam.addProperty("sourceWarehouseId", sourceWarehouseId);
+		extraParam.addProperty("invoiceType", invoiceType);
 		
 		JsonObject params = new JsonObject();
 		params.addProperty("barcode", barcode);
-		params.addProperty("invoiceType", invoiceType);
 		
+		
 		params.add("extraParam", extraParam);
 		
+		
 		try {
 			JsonObject result = invoiceManager.getInfoByBarcodeForInvoiceScan(params);
 			JsonElement result2 = convertResult(result);