Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
===================================================================
diff -u -r16102 -r16108
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 16102)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 16108)
@@ -692,6 +692,7 @@
 				hideTrigger : true,
 				typeAhead : false,
 				allowBlank : true,
+                pageSize: 100,
 				width : 180,
 				listWidth : 400,  //下拉列表的宽度（陈家儒改）
 				//listConfig: {width : 500},//Ext4才支持
@@ -845,6 +846,8 @@
 						valueField : 'id',
 						displayField : 'displayName',
 						store : materialStore,
+                        pageSize: 100,
+                        listWidth : 400,
 						forceSelection : true,
 						lazyInit : false,
 						triggerAction : 'all',
@@ -1355,7 +1358,7 @@
             }
         }]
     };
-    var queryForm = new TBarForm(tousseOrDiposableGoodsStore).initForm(exportBtn);
+    var queryForm = new TBarForm(tousseOrDiposableGoodsStore, 100).initForm(exportBtn);
 
     var viewport = new Ext.Viewport({
         layout: 'border',
Index: ssts-web/src/main/webapp/js/tBarForm.js
===================================================================
diff -u -r15567 -r16108
--- ssts-web/src/main/webapp/js/tBarForm.js	(.../tBarForm.js)	(revision 15567)
+++ ssts-web/src/main/webapp/js/tBarForm.js	(.../tBarForm.js)	(revision 16108)
@@ -1,11 +1,13 @@
 /**
  * 工具栏的表单类
  * @param keyWordStore 关键字搜索的数据源,由于不是所有的数据源都能用，所以可以通过下面的setKeyWordStore方法来自定义数据
+ * @param isPage 是否分页(如果是false则不分页,注:extJs2里面combo的分页大小由pageSize控制,而ExtJs4则由store的pageSize控制)
  * @see #setKeyWordStore
  * @constructor
  */
-var TBarForm = function (keyWordStore) {
+var TBarForm = function (keyWordStore, isPage) {
     var me = this;
+    me.searchKeyWord.pageSize = isPage || false;
     if (!isUndefinedOrNullOrEmpty(keyWordStore)) {
         me.searchKeyWord.store = keyWordStore;
     }
@@ -110,8 +112,9 @@
 /**
  * 自定义关键字搜索的数据源,由于部分store不一定能用,所以可以在这里定义数据源
  * @param url 数据源的url
+ * @param isPage store是否分页
  */
-TBarForm.prototype.setKeyWordStore = function (url) {
+TBarForm.prototype.setKeyWordStore = function (url, isPage) {
     var me = this;
     var keyWordStore = new Ext.data.Store({
         proxy: new Ext.data.HttpProxy({
@@ -130,6 +133,7 @@
         ])
     });
     me.searchKeyWord.store = keyWordStore;
+    me.searchKeyWord.pageSize = isPage || false;
 }
 
 //关键字输入框
@@ -143,6 +147,7 @@
     valueField: 'id',
     displayField: 'name',
     width: 600,
+    listWidth: 400,
     forceSelection: true,
     lazyInit: true,
     triggerAction: 'all',
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r15294 -r16108
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 15294)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 16108)
@@ -207,6 +207,17 @@
 		return json;
 	}
 
+	@Override
+	public List<Map<String,Object>> findMaterialDefinitionAndStockByWarehouseId(String simpleSpell, boolean isSeachMaterialDefinition , Long warehouseId){
+		List<Long> wareHouseIds = new ArrayList<>();
+		if(DatabaseUtil.isPoIdValid(warehouseId)){
+			wareHouseIds.add(warehouseId);
+		}
+		List<Map<String, Object>> mapList = searchMaterialDefinitionOrDiposableGoodsBySpell(simpleSpell, isSeachMaterialDefinition , wareHouseIds);
+		return mapList;
+	}
+
+
 	private String getSelfSearchSQL(String searchMode, String simpleSpell) {
 		String sql = "";
 		if (StringUtils.isNotBlank(searchMode)) {
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
===================================================================
diff -u -r15260 -r16108
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 15260)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 16108)
@@ -53,6 +53,15 @@
 	public JSONObject searchMaterialDefinitionAndStockByWarehouseId(
 			String simpleSpell, boolean isSeachMaterialDefinition , Long warehouseId);
 	/**
+	 * 根据拼音码、五笔码、仓库获取材料信息及库存(用list返回)
+	 * @see MaterialDefinitionManager#searchMaterialDefinitionAndStockByWarehouseId
+	 * @param simpleSpell
+	 * @param isSeachMaterialDefinition
+	 * @param warehouseId
+	 * @return
+	 */
+	 List<Map<String,Object>> findMaterialDefinitionAndStockByWarehouseId(String simpleSpell, boolean isSeachMaterialDefinition , Long warehouseId);
+	/**
 	 * 根据拼音码、五笔码、仓库获取材料信息及库存
 	 */
 	public List<Map<String, Object>> searchMaterialDefinitionOrDiposableGoodsBySpell(
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r15743 -r16108
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 15743)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 16108)
@@ -15,6 +15,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.forgon.tools.util.PageUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -629,10 +630,12 @@
 			spell = java.net.URLDecoder.decode(spell, "UTF-8");
 			Long warehouseId = StrutsParamUtils.getPraramLongValue("wareHouseId",
 					null);
-			JSONObject json = materialDefinitionManager
-					.searchMaterialDefinitionAndStockByWarehouseId((spell), true , warehouseId);
-			StrutsResponseUtils.output(json);
-		} catch (UnsupportedEncodingException e) {
+			List<Map<String, Object>> list = materialDefinitionManager.findMaterialDefinitionAndStockByWarehouseId((spell), true, warehouseId);
+			PageUtil.outPutResult(PageUtil.getPagePara(), list);
+			// JSONObject json = materialDefinitionManager
+			// 		.searchMaterialDefinitionAndStockByWarehouseId((spell), true , warehouseId);
+			// StrutsResponseUtils.output(json);
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return null;