Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
===================================================================
diff -u -r14593 -r14596
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java	(.../ReturnMaterialRecordTableManager.java)	(revision 14593)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java	(.../ReturnMaterialRecordTableManager.java)	(revision 14596)
@@ -53,20 +53,20 @@
 			if (StringUtils.isNotBlank(specification)) {
 				sql += " and po.id in (select rmi.returnMaterialRecord.id from "
 						+ ReturnMaterialItem.class.getName()
-						+ " rmi inner join " + MaterialDefinition.class.getSimpleName() 
-						+ " md on md.id=rmi.materialDefinitionId where md.name = '"
+						+ " rmi, " + MaterialDefinition.class.getSimpleName() 
+						+ " md where md.id=rmi.materialDefinitionId and md.name = '"
 						+ keyWord + "' and md.specification='" + specification
 						+ "')";
 			} else {
 				sql += " and (po.id in (select rmi.returnMaterialRecord.id from "
 						+ ReturnMaterialItem.class.getName()
-						+ " rmi inner join " + MaterialDefinition.class.getSimpleName() 
-						+ " md on md.id=rmi.materialDefinitionId where md.name = '"
+						+ " rmi, " + MaterialDefinition.class.getSimpleName() 
+						+ " md where md.id=rmi.materialDefinitionId and md.name = '"
 						+ keyWord
 						+ "' and (md.specification is null or md.specification = '')) or po.id in (select rmi.returnMaterialRecord.id from "
 						+ ReturnMaterialItem.class.getName()
-						+ " rmi inner join " + MaterialDefinition.class.getSimpleName() 
-						+ " md on md.id=rmi.materialDefinitionId where md.name = '"
+						+ " rmi, " + MaterialDefinition.class.getSimpleName() 
+						+ " md where md.id=rmi.materialDefinitionId and md.name = '"
 						+ keyWord + "'))";
 			}
 		}
@@ -84,6 +84,7 @@
 		}
 		sql += " and po.handleDepartCode = '" + AcegiHelper.getLoginUser()
 				.getCurrentOrgUnitCode() + "'";
+//		System.out.println(sql);
 		return gridManager.renderGrid(parameterMap,
 				ReturnMaterialRecord.class.getSimpleName(), sql, new String[] {
 						"returnMaterialItems" });