Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r32166 -r32169
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 32166)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 32169)
@@ -148,39 +148,33 @@
 		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();
-			goodsStockVo.setAmount(rs2.getInt("amount"));
-			goodsStockVo.setName("总数");
-			goodsStockVo.setOrgUnitName("");
-			goodsStockVoList.add(goodsStockVo);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally {
-			DatabaseUtil.closeResultSetAndStatement(rs2);
-		}*/
+		if(totalResults <= pageEnd){
+			// 只在最后一页显示总数
+			ResultSet rs2 = objectDao.executeSql("select '','',sum(rs.amount) amount from " + sql);  //汇总数量
+			try {
+				rs2.next();
+				GoodsStockVo goodsStockVo = new GoodsStockVo();
+				goodsStockVo.setAmount(rs2.getInt("amount"));
+				goodsStockVo.setName("总数");
+				goodsStockVo.setOrgUnitName("");
+				goodsStockVoPageList.add(goodsStockVo);
+			} catch (SQLException e) {
+				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);