diff --git a/src/main/java/com/zzjee/wmutil/wmUtil.java b/src/main/java/com/zzjee/wmutil/wmUtil.java
index 61630639..fb428ac8 100644
--- a/src/main/java/com/zzjee/wmutil/wmUtil.java
+++ b/src/main/java/com/zzjee/wmutil/wmUtil.java
@@ -411,7 +411,7 @@ public class wmUtil {
 		SystemService systemService =ApplicationContextUtil.getContext().getBean(SystemService.class);
 
 		List<WvStockEntity> list = systemService.findHql(hql,checkvalue);
-        if(list!=null&&list.size()>0){
+        if(list!=null&&list.size()>0&&list.get(0).getGoodsQua()>0.01){//判断库存不为0
 			ishavestock = true;
 		}
     	return  ishavestock;
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp
index 5da4168b..d84fd5fd 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp
@@ -61,10 +61,10 @@
     <t:dgCol title="停用"  field="zhuangTai"   query="true" dictionary="sf_yn" width="120"></t:dgCol>
       <t:dgFunOpt title="打印" funname="doprint(id)"  urlclass="ace_button"      />
 
-      <t:dgDelOpt title="删除" operationCode="mdgoodsdel" url="mdGoodsController.do?doDel&id={id}" urlclass="ace_button"  urlfont="fa-trash-o"/>
+      <t:dgDelOpt title="删除"   url="mdGoodsController.do?doDel&id={id}" urlclass="ace_button"  urlfont="fa-trash-o"/>
    <t:dgToolBar title="录入" height="760" width="740" icon="icon-add" url="mdGoodsController.do?goAdd" funname="add"></t:dgToolBar>
    <t:dgToolBar title="编辑" height="720" width="740"  icon="icon-edit" operationCode="mdgoodsedit" url="mdGoodsController.do?goUpdate" funname="update"></t:dgToolBar>
-<%--    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdGoodsController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
+    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdGoodsController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar>
    <t:dgToolBar title="查看" height="720" width="740"  icon="icon-search" url="mdGoodsController.do?goUpdate" funname="detail"></t:dgToolBar>
    <t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar>
     <t:dgToolBar operationCode="uasimpgoods" title="第三方系统导入" icon="icon-put" funname="otherimp"></t:dgToolBar>