Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r13165 -r13166
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 13165)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 13166)
@@ -286,9 +286,9 @@
 	}
 
 	@Override
-	public List<GodownEntry> getGodownEntryListBySql(String sql) {
-		if (StringUtils.isNotBlank(sql)) {
-			return objectDao.findBySql(GodownEntry.class.getSimpleName(), sql);
+	public List<GodownEntry> getGodownEntryListByHql(String hql) {
+		if (StringUtils.isNotBlank(hql)) {
+			return objectDao.findBySql(GodownEntry.class.getSimpleName(), hql);
 		}
 		return null;
 	}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
===================================================================
diff -u -r12942 -r13166
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 12942)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 13166)
@@ -97,7 +97,7 @@
 		Map<String, String> dayMap = getMonthStartAndEndDate();
 		String sql = " where po.time between " + dateQueryAdapter.dateAdapter(dayMap.get("startDay")) +
 				" and " + dateQueryAdapter.dateAdapter(dayMap.get("endDay")) + " and po.type = '入库单'";
-		return godownEntryManager.getGodownEntryListBySql(sql);
+		return godownEntryManager.getGodownEntryListByHql(sql);
 	}
 
 	/**
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r12982 -r13166
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12982)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13166)
@@ -88,7 +88,7 @@
 		String sql = getGodownEntryListSql(sqlWhereParamMap);
 		String startDate = sqlWhereParamMap.get("startDate");
 		String endDate = sqlWhereParamMap.get("endDate");
-		List<GodownEntry> list = godownEntryManager.getGodownEntryListBySql(sql);
+		List<GodownEntry> list = godownEntryManager.getGodownEntryListByHql(sql);
 		Double sum = 0.0;
 		for(GodownEntry entry : list){
 			sum += entry.getTotalPrice();
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/ProjectSpecificMaintainManagerImpl.java
===================================================================
diff -u -r12942 -r13166
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/ProjectSpecificMaintainManagerImpl.java	(.../ProjectSpecificMaintainManagerImpl.java)	(revision 12942)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/ProjectSpecificMaintainManagerImpl.java	(.../ProjectSpecificMaintainManagerImpl.java)	(revision 13166)
@@ -154,7 +154,7 @@
 	// 遍历入库单入库
 	public void iterateGodownEntries(){
 		String sql = " where po.type = '入库单'";
-		List<GodownEntry> entries = godownEntryManager.getGodownEntryListBySql(sql);
+		List<GodownEntry> entries = godownEntryManager.getGodownEntryListByHql(sql);
 		for (GodownEntry entry : entries){
 			List<GodownEntryItem>  items = entry.getItemsList();
 			
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
===================================================================
diff -u -r13122 -r13166
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 13122)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 13166)
@@ -23,9 +23,13 @@
 	public List<GodownEntryItem> getGodownEntryItemByDiposableGoodsId(String diposableGoodsId);
 	
 	public List<GodownEntryItem> getGodownEntryItem(String diposableGoodsName,String batchNumber);
+	/**
+	 * 根据hql查询语句获取数据
+	 * @param hql HQL查询语句
+	 * @return
+	 */
+	public List<GodownEntry> getGodownEntryListByHql(String hql);
 	
-	public List<GodownEntry> getGodownEntryListBySql(String sql);
-	
 	// 保存入库单
 	public void saveGodownEntry_TRANS_REQUIRED(GodownEntry entry,Map<String,Object> result);
 	// 保存入库单,只修改库存，不改其他属性，用于盘点与调拨