Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r17380 -r17404
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17380)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17404)
@@ -51,6 +51,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
+import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition;
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
@@ -227,6 +228,12 @@
 		List<TousseInstance> tousseInstanceList = objectDao.findBySql(TousseInstance.class.getSimpleName(),
 				String.format("where tousseName='%s'", tousseDefinition.getName()));
 		
+		// 判断是否有标识牌
+		List<IDCardDefinition> idCardDefinitionList = objectDao.findByProperty(IDCardDefinition.class.getSimpleName(),
+				"tousseDefinitionID", tousseDefinition.getId() + "");
+		if(!idCardDefinitionList.isEmpty()){
+			return false;
+		}
 		if (CollectionUtils.isNotEmpty(tousseItemList)) {
 			return false;
 		} else if (CollectionUtils.isNotEmpty(tousseInstanceList)) {
@@ -237,6 +244,7 @@
 				return false;
 			}
 		}
+		
 		return doDelete(tousseDefinition);
 	}
 	/**
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r17361 -r17404
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 17361)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 17404)
@@ -910,7 +910,7 @@
 					}
 					message = "{success:true}";
 				}else{
-					message = "{success:false,cause:'已生成器械包无法删除。'}";
+					message = "{success:false,cause:'已生成器械包或标识牌,无法删除。'}";
 				}
 				
 			}