Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r41490 -r41582
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 41490)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 41582)
@@ -86,6 +86,7 @@
 import com.forgon.disinfectsystem.basedatamanager.tousseGroup.service.TousseGroupManager;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils;
 import com.forgon.disinfectsystem.basedatamanager.urgent.service.UrgentLevelManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.StorageLocationManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.StorageRecordManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.borrowrecord.service.BorrowRecordManager;
@@ -511,6 +512,8 @@
 	
 	@Autowired
 	private StorageLocationGoodsAccessManager storageLocationGoodsAccessManager;
+	@Autowired
+	private StorageLocationManager storageLocationManager;
 
 	public void setDbConnection(InitDbConnection dbConnection) {
 		this.dbConnection = dbConnection;
@@ -3245,7 +3248,9 @@
 			json.put("barcode", barcode);
 			json.put("type", "disposableGoodsBatchStock");
 			json.putAll(sterilizationRecordManager.getBarcodeTypeByDisposableGoodsBatch(barcodeDevice));
-			JSONUtil.addSuccess(json, true);
+			if(json.optBoolean(JSONUtil.JSON_KEY_SUCCESS,true)){
+				JSONUtil.addSuccess(json, true);
+			}
 			return json.toString();
 		} else if(barcodeDevice instanceof User){
 			//如果扫的是用户条码
@@ -9749,5 +9754,19 @@
 		String result = cleanMethodManager.findCleanMethodArr();
 		return JSONUtil.buildJsonObject(true, JSONArray.fromObject(result)).toString();
 	}
+	
+	/**
+	 * 根据库位名称模糊查找库位
+	 */
+	public String searchStorageLocationByKeyword (JSONObject params) {
+		String keyword = params.optString("keyword", "");
+		//库位所属科室
+		String orgUnitCode = params.optString("orgUnitCode", "");
+		//只查询叶子节点的库位
+		boolean searchLeafStorageLocation = params.optBoolean("searchLeafStorageLocation", false);
+		JSONObject jsonObj = storageLocationManager.findAllStorageLocationJsonByKeyword(keyword, orgUnitCode, searchLeafStorageLocation);
+		JSONUtil.addSuccess(jsonObj, true);
+		return jsonObj.toString();
+	}
 
 }