Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r32160 -r32166
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 32160)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 32166)
@@ -8,6 +8,7 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.forgon.component.grid.GridManager;
@@ -59,7 +60,6 @@
 	 * @param parameterMap
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
 	public String findTousseGoodsStockSummaryTableList(
 			Map<String, List<String>> parameterMap) {
 
@@ -144,7 +144,23 @@
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		
-		ResultSet rs2 = objectDao.executeSql("select '','',sum(rs.amount) amount from " + sql);  //汇总数量
+		int pageSize = gridManager.getPageSizeParameter(parameterMap);
+		int pageStart = gridManager.getStartParameter(parameterMap);
+		int pageEnd = pageStart + pageSize;
+		
+		int totalAmount = 0;
+		List<GoodsStockVo> goodsStockVoPageList = new ArrayList<GoodsStockVo>();
+		if(CollectionUtils.isNotEmpty(goodsStockVoList)){
+			for (int i = 0; i < goodsStockVoList.size() && i < pageEnd; i++) {
+				GoodsStockVo vo = goodsStockVoList.get(i);
+				if(i >= pageStart && i< pageEnd){
+					goodsStockVoPageList.add(vo);
+					totalAmount += vo.getAmount();
+				}
+			}
+		}
+		
+		/*ResultSet rs2 = objectDao.executeSql("select '','',sum(rs.amount) amount from " + sql);  //汇总数量
 		try {
 			rs2.next();
 			GoodsStockVo goodsStockVo = new GoodsStockVo();
@@ -156,14 +172,20 @@
 			e.printStackTrace();
 		}finally {
 			DatabaseUtil.closeResultSetAndStatement(rs2);
-		}
+		}*/
 		
+		GoodsStockVo goodsStockVo = new GoodsStockVo();
+		goodsStockVo.setAmount(totalAmount);
+		goodsStockVo.setName("总数");
+		goodsStockVo.setOrgUnitName("");
+		goodsStockVoPageList.add(goodsStockVo);
 		
+		
 //		Map<String, Object> map = new HashMap<String, Object>();
 //		map.put("totalResults", totalResults);
 //		map.put("list", goodsStockList);
 //		map.put("selectSqlWhereCondition", sql);
-		String json = gridManager.converJsonString(totalResults, goodsStockVoList, sql , new String[]{});
+		String json = gridManager.converJsonString(totalResults, goodsStockVoPageList, sql , new String[]{});
 		return json;
 	}