Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r12847 -r12853
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 12847)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 12853)
@@ -1287,10 +1287,11 @@
 		extraParam.addProperty("mode", "depart");
 		extraParam.addProperty("departCodeOfInvoicePlan", orgUnitCoding);
 		extraParam.add("scannedBarcodes", scannedBarcodes);
+		extraParam.addProperty("sourceWarehouseId", sourceWarehouseId);
 		
 		JsonObject params = new JsonObject();
 		params.addProperty("barcode", barcode);
-		params.addProperty("sourceWarehouseId", sourceWarehouseId);
+		
 		params.add("extraParam", extraParam);
 		
 		try {
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r12847 -r12853
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12847)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12853)
@@ -2960,7 +2960,7 @@
 			}
 		} else if (barcodeDevice instanceof DisposableGoodsBatch) {
 			// 一次性物品
-			Long sourceWarehouseId = params.get("sourceWarehouseId").getAsLong();
+			Long sourceWarehouseId = extraParam.get("sourceWarehouseId").getAsLong();
 			DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch) barcodeDevice;
 			DisposableGoods diposableGoods = disposableGoodsBatch
 					.getDiposableGoods();
@@ -3315,7 +3315,7 @@
 			}
 		} else if (barcodeDevice instanceof DisposableGoodsBatch) {
 			// 一次性物品
-			Long sourceWarehouseId = params.get("sourceWarehouseId").getAsLong();
+			Long sourceWarehouseId = extraParam.get("sourceWarehouseId").getAsLong();
 			DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch) barcodeDevice;
 			DisposableGoods diposableGoods = disposableGoodsBatch
 					.getDiposableGoods();
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12821 -r12853
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12821)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12853)
@@ -947,6 +947,13 @@
 				DisposableGoods.class.getSimpleName(), sql);
 	}
 	public DisposableGoodsBatchStock getDisposableGoodsStockByBatchNumber(Long warehouseID,Long disposableGoodsID, String batchNumber){
+		if (!DatabaseUtil.isPoIdValid(warehouseID)
+				|| !DatabaseUtil.isPoIdValid(disposableGoodsID)) {
+			return null;
+		}
+		if(StringUtils.isBlank(batchNumber)){
+			return null;
+		}
 		String sql = String.format(
 				" where po.warehouseID=%s and po.disposableGoodsID=%s and po.batchNumber='%s' ",warehouseID,
 				disposableGoodsID, batchNumber);
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
===================================================================
diff -u -r12728 -r12853
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 12728)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 12853)
@@ -818,6 +818,7 @@
 		JsonObject extraParamForScan = new JsonObject();
 		extraParamForScan.addProperty("mode", "depart");
 		extraParamForScan.addProperty("departCodeOfInvoicePlan", orgUnitCoding);
+//		extraParamForScan.addProperty("sourceWarehouseId", null);
 		params.add("extraParam", extraParamForScan);
 //		return invoiceManager.getInfoByBarcode(params).toString();
 		return invoiceManager.getInfoByBarcodeForInvoiceScan(params).toString();