Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r20627 -r20628
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20627)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20628)
@@ -2790,11 +2790,12 @@
 		String warningDate = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
 		String currentDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		//sql语句
-		String sql = String.format(" where %s ",SqlUtils.getLongFieldPredicate("po.disposableGoodsId", Long.valueOf(disposableGoodsID)));
+		String sql = String.format(" where po.storage > 0 and %s ",SqlUtils.getLongFieldPredicate("po.disposableGoodsId", Long.valueOf(disposableGoodsID)));
 		switch (expdateType) {
 		case SystemWarningItemVO.WARNING_TYPE_DIPOSABLEGOODS:
 			sql += " and po.expDate between "
 					+ dateQueryAdapter.dateAdapter(currentDate) + " and "
+					+ dateQueryAdapter.dateAdapter(warningDate)
 					+ "order by expDate";
 			break;
 		case SystemWarningItemVO.WARNING_TYPE_DISABLED_DIPOSABLEGOODS: