Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
===================================================================
diff -u -r13490 -r16324
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java	(.../GoodPurchaseAction.java)	(revision 13490)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java	(.../GoodPurchaseAction.java)	(revision 16324)
@@ -10,6 +10,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.tools.util.PageUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -118,13 +119,10 @@
 					null);
 			String handleDepartCode = AcegiHelper.getCurrentOrgUnitCode();
 			//一次性物品数据
-			JSONObject disposableGoodsAndMaterialJson = diposableGoodsManager.searchDisposableGoodsAndMaterialList(
-					spell, allItems,handleDepartCode,true);
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setContentType("text/html;charset=UTF-8");
-			PrintWriter out = response.getWriter();
-			out.print(disposableGoodsAndMaterialJson);
-			out.close();
+			// JSONObject disposableGoodsAndMaterialJson = diposableGoodsManager.searchDisposableGoodsAndMaterialList(
+			// 		spell, allItems,handleDepartCode,true);
+			List<Map<String, Object>> mapList = diposableGoodsManager.searchDisposableGoodsAndMaterialList(spell, allItems, handleDepartCode, true);
+			PageUtil.outPutResult(PageUtil.getPagePara(), mapList);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r16246 -r16324
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 16246)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 16324)
@@ -83,7 +83,8 @@
 	 * @param wareHouseId 科室的id,可以为null
 	 * @return
 	 */
-	public JSONObject searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods);
+	List<Map<String, Object>> searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods);
+	// public JSONObject searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods);
 
 	/**
 	 * 获取材料或者一次性物品的NAME和ID，用于store中
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
===================================================================
diff -u -r15581 -r16324
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js	(.../goodPurchasePlanView.js)	(revision 15581)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js	(.../goodPurchasePlanView.js)	(revision 16324)
@@ -8,7 +8,8 @@
 }
 //一次性物品及材料
 var disposableGoodsAndMaterialStore = new Ext.data.Store({
-	proxy : new Ext.data.HttpProxy({
+    pageSize: 100,
+    proxy : new Ext.data.HttpProxy({
 		url : disposableGoodsAndMaterialUrl,
 		method : 'POST'
 	}),
@@ -1386,7 +1387,7 @@
 	// 	}]
 	// });
 
-	var queryForm = new TBarForm(disposableGoodsAndMaterialStore).initForm();
+	var queryForm = new TBarForm(disposableGoodsAndMaterialStore, 100).initForm();
 
 	var viewport = new Ext.Viewport( {
 		layout : 'border',
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r16246 -r16324
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 16246)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 16324)
@@ -683,7 +683,7 @@
 	 * @param wareHouseId 科室的id,可以为null
 	 * @return
 	 */
-	public JSONObject searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods){
+	public List<Map<String, Object>> searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods){
 		//一次性物品sql
 		String sql = buildGetDisposableGoodsSql(simpleSpell, allItems);
 		//一次性物品结果
@@ -706,14 +706,41 @@
 				mapList.add(map);
 			}
 		}
-		
+		return mapList;
+	}
+/*
+	public JSONObject searchDisposableGoodsAndMaterialList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods){
+		//一次性物品sql
+		String sql = buildGetDisposableGoodsSql(simpleSpell, allItems);
+		//一次性物品结果
+		List<Map<String, Object>> disposableGoodsMapList = getDisposableGoodsListInternal(
+				handleDepartCode, sql,false,showExternalCodeOfDisposableGoods);
+
+		//材料结果
+		List<Map<String, Object>> materialDefinitionMapList = getMaterialDefinitionListInternal(
+				handleDepartCode, buildGetMaterialDefinitionSql(simpleSpell),false,false);
+
+		List<Map<String, Object>> mapList = new ArrayList<Map<String,Object>>();
+		if(CollectionUtils.isNotEmpty(disposableGoodsMapList)){
+			for(Map<String, Object> map : disposableGoodsMapList){
+				mapList.add(map);
+			}
+		}
+
+		if(CollectionUtils.isNotEmpty(materialDefinitionMapList)){
+			for(Map<String, Object> map : materialDefinitionMapList){
+				mapList.add(map);
+			}
+		}
+
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("totalCount", mapList.size());
-		
+
 		map.put("data", mapList);
 		System.out.println("JSONObject.fromObject(map)=\n"+JSONObject.fromObject(map));
 		return JSONObject.fromObject(map);
 	}
+*/
 
 	/**
 	 * 获取一次性物品NAME和ID