Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r18480 -r18494
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18480)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18494)
@@ -1664,16 +1664,16 @@
 		var position = Ext.getCmp("position").getValue();
 		materialInfo += material +"@"+ amount + "@" + position + "@" + 2 + ";";
 		if(tousseName){
-			var isExist = false;
-			var count = materialDefinitionStore.getCount();
-			for(var i=0;i<count;i++){
-				var r = materialDefinitionStore.getAt(i);
-				if(r.data.name == material){
-					isExist = true;
-					break;
-				}
-			}
-			if(!isExist){
+			var tousseDefinitionId = Ext.getCmp('tousseDefinitionId').getValue();
+			var isContain = false;
+			// 判断材料是否在包里面
+			DWREngine.setAsync(false);
+			TousseInstanceTableManager.isTiContainsMaterial(tousseDefinitionId,material,function(responseText){
+				result = Ext.decode(responseText);
+				isContain = result.isContain;
+			});
+			DWREngine.setAsync(true);
+			if(isContain == false){
 				showResultQM('器械包' + tousseName +'中找不到找材料“'+material+'”');
 	            Ext.getCmp('material').setValue('');
 				Ext.getCmp('materialAmount').setValue();
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r18467 -r18494
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18467)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18494)
@@ -35,6 +35,7 @@
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.diposablegoods.util.DisposableGoodsUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.operationRoom.OperationRoom;
 import com.forgon.disinfectsystem.entity.basedatamanager.position.TousseOperation;
@@ -47,6 +48,7 @@
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
+import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.disinfectsystem.tousseitem.service.TousseItemUtils;
@@ -86,6 +88,13 @@
 	private ReviewedBasketManager reviewedBasketManager;
 	
 	private TimeoutManager timeoutManager;
+	
+	private MaterialInstanceManager materialInstanceManager;
+	
+	public void setMaterialInstanceManager(
+			MaterialInstanceManager materialInstanceManager) {
+		this.materialInstanceManager = materialInstanceManager;
+	}
 
 	public void setTimeoutManager(TimeoutManager timeoutManager) {
 		this.timeoutManager = timeoutManager;
@@ -829,4 +838,29 @@
 		String selectSqlWhereCondition = "";
 		return gridManager.converJsonString(totalResults, objList, selectSqlWhereCondition,null);
 	}
+	/*
+	 * 判断包定义里面，是否包含材料 ,材料名称包含规格
+	 */
+	public String isTiContainsMaterial(String tousseDefinttionId,String materialName) throws SQLException{
+		JSONObject obj = new JSONObject();
+		obj.put("isContain", false);
+		if(!StringUtils.isNumeric(tousseDefinttionId) || StringUtils.isBlank(materialName)){
+			return obj.toString();
+		}
+		TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(tousseDefinttionId);
+		if( td != null){
+			List<MaterialInstance> mis = td.getMaterialInstances();
+			if(CollectionUtils.isNotEmpty(mis)){
+				for(MaterialInstance mi : mis){
+					MaterialDefinition md = mi.getMaterialDefinition();
+					String mdName = CssdUtils.getMaterialName(md);
+					if(materialName.equals(mdName)){
+						obj.put("isContain", true);
+						return obj.toString();
+					}
+				}
+			}
+		}
+		return obj.toString();
+	}
 }