Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
===================================================================
diff -u -r15631 -r16292
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 15631)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 16292)
@@ -94,20 +94,29 @@
 	}
 
 	@Override
-	public JSONObject searchDisposableGoodsStockList(String spell,
+	public List<Map<String,Object>> searchDisposableGoodsStockList(String spell,
 			String allItems, String wareHouseId) {
 		String sql = buildGetDisposableGoodsStockSql(spell, allItems);
-		
 		if(DatabaseUtil.isPoIdValid(wareHouseId)){
 			sql += " and po.warehouseID = " + wareHouseId;
 		}
+		List<Map<String, Object>> mapList = getDisposableGoodsStockListInternal(wareHouseId, sql,true);
+		return mapList;
+	}
+	/*public JSONObject searchDisposableGoodsStockList(String spell,
+			String allItems, String wareHouseId) {
+		String sql = buildGetDisposableGoodsStockSql(spell, allItems);
+
+		if(DatabaseUtil.isPoIdValid(wareHouseId)){
+			sql += " and po.warehouseID = " + wareHouseId;
+		}
 		List<Map<String, Object>> mapList = getDisposableGoodsStockListInternal(
 				wareHouseId, sql,true);
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("totalCount", mapList.size());
 		map.put("data", mapList);
 		return JSONObject.fromObject(map);
-	}
+	}*/
 	/**
 	 * 将一次性物品的库存信息放入List列表中
 	 * @param wareHouseId
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r16030 -r16292
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 16030)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 16292)
@@ -64,6 +64,7 @@
 }
 //全部一次性物品
 var allDiposableGoodsStore = new Ext.data.Store({
+    pageSize: 100,
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes',
 		method : 'POST'
@@ -117,6 +118,7 @@
 });
 
 var disposableGoodsStockStore = new Ext.data.Store({
+    pageSize: 100,
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/disposableGoodsStockAction!getDisposableGoodsStockData.do',
 		method : 'POST'
@@ -646,6 +648,8 @@
 				minChars : 0,
 				valueField : 'id',
 				displayField : 'name',
+                pageSize : 100,
+                listConfig: {width: 300},
 				store : disposableGoodsStockStore,
 				forceSelection : true,
 				lazyInit : false,
@@ -654,7 +658,7 @@
 				typeAhead : false,
 				allowBlank : true,
 				disabled : true,
-				width : 180,
+				width : 300,
 				listeners : {
 					select : function(combo, record, index) {
 						top.Ext.getCmp('name1').setValue(record.data.name);
@@ -1112,6 +1116,8 @@
 					displayField : 'displayName',
 					width : 600,
 					store : allDiposableGoodsStore,
+                    pageSize : 100,
+                    listConfig: {width: 300},
 					forceSelection : true,
 					lazyInit : true,
 					triggerAction : 'all',
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java
===================================================================
diff -u -r12867 -r16292
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java	(.../DisposableGoodsStockManager.java)	(revision 12867)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java	(.../DisposableGoodsStockManager.java)	(revision 16292)
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import net.sf.json.JSONObject;
 
@@ -34,13 +35,22 @@
 	 */
 	public boolean verifyDiposableGoods(String id, String name,
 			String specification);
+/*	*//**
+	 * 获取一次性物品库存列表
+	 * @param spell
+	 * @param allItems
+	 * @param wareHouseId
+	 * @return
+	 *//*
+	public JSONObject searchDisposableGoodsStockList(String spell,
+			String allItems, String wareHouseId);*/
+
 	/**
 	 * 获取一次性物品库存列表
 	 * @param spell
 	 * @param allItems
 	 * @param wareHouseId
 	 * @return
 	 */
-	public JSONObject searchDisposableGoodsStockList(String spell,
-			String allItems, String wareHouseId);
+	List<Map<String,Object>> searchDisposableGoodsStockList(String spell, String allItems, String wareHouseId);
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java
===================================================================
diff -u -r13028 -r16292
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java	(.../DisposableGoodsStockAction.java)	(revision 13028)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java	(.../DisposableGoodsStockAction.java)	(revision 16292)
@@ -12,6 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.tools.util.PageUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -330,13 +331,8 @@
 						null);
 				
 				System.out.println("wareHouseId:" + wareHouseId);
-				JSONObject json = disposableGoodsStockManager.searchDisposableGoodsStockList(
-						spell, allItems,wareHouseId);
-				HttpServletResponse response = StrutsParamUtils.getResponse();
-				response.setCharacterEncoding("UTF-8");
-				PrintWriter out = response.getWriter();
-				out.print(json);
-				out.close();
+				List<Map<String, Object>> mapList = disposableGoodsStockManager.searchDisposableGoodsStockList(spell, allItems, wareHouseId);
+				PageUtil.outPutResult(PageUtil.getPagePara(), mapList);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}