Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
===================================================================
diff -u -r25220 -r25549
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 25220)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 25549)
@@ -747,30 +747,38 @@
 				String sql = "select min(m.externalCode),min(m.name),min(m.specification),sum(s.amount),s.price,m.id,min(m.unit),min(m.goodsType),min(m.type),min(m.sequence) from MaterialDefinition m "
 						   + ", GoodsStock s where m.id = s.materialDefinitionId and m.inventoryDepartCoding like '%" + inventoryDepartCoding + "%' and "
 						   + "wareHouseId = " + wareHouseId + " and s.amount > 0 group by m.id,s.price order by min(m.externalCode) asc";
-				ResultSet rs = objectDao.executeSql(sql);
-				while(rs.next()){
-					InventoryItem item = new InventoryItem();
-	    			item.setMaterialName(rs.getString(2));
-	    			item.setPrice(rs.getDouble(5));
-	    			String sp = rs.getString(3);
-	    			if(StringUtils.isBlank(sp)){
-	    				sp = null;
-	    			}
-	    			item.setSpecification(sp);
-	    			item.setInventoryRecordId(record.getId());
-	    			item.setStorage(rs.getInt(4));
-	    			item.setSupplierName("");
-	    			item.setMaterialID(rs.getLong(6));
-	    			item.setExternalCode(rs.getString(1));
-	    			item.setWareHouseId(wareHouseId);
-	    			item.setWareHouseName(warehouse.getName());
-	    			item.setUnit(rs.getString(7));
-	    			item.setGoodsType(rs.getString(8));
-	    			item.setType(rs.getString(9));
-	    			item.setSequence(rs.getInt(10));
-	    			items.add(item);
+				ResultSet rs = null;
+				try{
+					rs = objectDao.executeSql(sql);
+					while(rs.next()){
+						InventoryItem item = new InventoryItem();
+						item.setMaterialName(rs.getString(2));
+						item.setPrice(rs.getDouble(5));
+						String sp = rs.getString(3);
+						if(StringUtils.isBlank(sp)){
+							sp = null;
+						}
+						item.setSpecification(sp);
+						item.setInventoryRecordId(record.getId());
+						item.setStorage(rs.getInt(4));
+						item.setSupplierName("");
+						item.setMaterialID(rs.getLong(6));
+						item.setExternalCode(rs.getString(1));
+						item.setWareHouseId(wareHouseId);
+						item.setWareHouseName(warehouse.getName());
+						item.setUnit(rs.getString(7));
+						item.setGoodsType(rs.getString(8));
+						item.setType(rs.getString(9));
+						item.setSequence(rs.getInt(10));
+						items.add(item);
+					}
+					record.setItems(items);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}finally{
+					//关闭结果集对象
+					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
-			    record.setItems(items);
 			}else if(InventoryRecord.TYPECODE_DISPOSABLEGOODS.equals(type)){
 				@SuppressWarnings("unchecked")
 				List<DisposableGoodsStock> goodsStockList = objectDao
@@ -977,29 +985,37 @@
 				String sql = "select min(m.externalCode),min(m.name),min(m.specification),sum(s.amount),s.price,m.id,min(m.unit),min(m.goodsType),min(m.type) from MaterialDefinition m "
 						+ ", GoodsStock s where m.id = s.materialDefinitionId and m.inventoryDepartCoding like '%" + inventoryDepartCoding + "%' and "
 						+ "wareHouseId = " + wareHouseId + " and s.amount > 0 group by m.id,s.price order by min(m.externalCode) asc";
-				ResultSet rs = objectDao.executeSql(sql);
-				while(rs.next()){
-					InventoryItem item = new InventoryItem();
-					item.setMaterialName(rs.getString(2));
-					item.setPrice(rs.getDouble(5));
-					String sp = rs.getString(3);
-					if(StringUtils.isBlank(sp)){
-						sp = null;
+				ResultSet rs = null;
+				try{
+					rs = objectDao.executeSql(sql);
+					while(rs.next()){
+						InventoryItem item = new InventoryItem();
+						item.setMaterialName(rs.getString(2));
+						item.setPrice(rs.getDouble(5));
+						String sp = rs.getString(3);
+						if(StringUtils.isBlank(sp)){
+							sp = null;
+						}
+						item.setSpecification(sp);
+						item.setInventoryRecordId(record.getId());
+						item.setStorage(rs.getInt(4));
+						item.setSupplierName("");
+						item.setMaterialID(rs.getLong(6));
+						item.setExternalCode(rs.getString(1));
+						item.setWareHouseId(wareHouseId);
+						item.setWareHouseName(warehouse.getName());
+						item.setUnit(rs.getString(7));
+						item.setGoodsType(rs.getString(8));
+						item.setType(rs.getString(9));
+						items.add(item);
 					}
-					item.setSpecification(sp);
-					item.setInventoryRecordId(record.getId());
-					item.setStorage(rs.getInt(4));
-					item.setSupplierName("");
-					item.setMaterialID(rs.getLong(6));
-					item.setExternalCode(rs.getString(1));
-					item.setWareHouseId(wareHouseId);
-					item.setWareHouseName(warehouse.getName());
-					item.setUnit(rs.getString(7));
-					item.setGoodsType(rs.getString(8));
-					item.setType(rs.getString(9));
-					items.add(item);
+					record.setItems(items);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}finally{
+					//关闭结果集对象
+					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
-				record.setItems(items);
 			}else if("disposableGoods".equals(type)){
 				@SuppressWarnings("unchecked")
 				//查询一次性物品库存表进行一次性物品的盘点