Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
===================================================================
diff -u -r12870 -r13009
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 12870)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 13009)
@@ -25,6 +25,7 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.SqlUtils;
 
 public class DisposableGoodsStockManagerImpl implements
 		DisposableGoodsStockManager {
@@ -57,10 +58,8 @@
 			String sql = " where po.disposableGoodsID = " + disposableGoodsId 
 					+ " and po.warehouseID = " 
 					+ wareHouseId;
-			List<DisposableGoodsStock> list = objectDao.findBySql(DisposableGoodsStock.class.getSimpleName(), sql);
-			if(list != null && !list.isEmpty()){
-				return (DisposableGoodsStock)list.get(0);
-			}
+			DisposableGoodsStock disposableGoodsStock = (DisposableGoodsStock)objectDao.getBySql(DisposableGoodsStock.class.getSimpleName(), sql);
+			return disposableGoodsStock;
 		}
 		return null;
 	}
@@ -82,11 +81,8 @@
 		if (StringUtils.isNotEmpty(id)) {
 			sql += " and po.id != " + id;
 		}
-		if (StringUtils.isNotBlank(specification)) {
-			sql += " and po.specification = '" + specification + "'";
-		} else {
-			sql += " and po.specification is null";
-		}
+		sql += String.format(" and %s ", SqlUtils.getStringFieldPredicate("po.specification", specification));
+		
 		if (objectDao.getBySql(DisposableGoodsStock.class.getSimpleName(), sql) != null) {
 			return false;
 		} else {
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
===================================================================
diff -u -r12943 -r13009
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 12943)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 13009)
@@ -5,7 +5,6 @@
 import net.sf.json.JSONObject;
 
 import com.forgon.directory.model.OrgUnit;
-import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;