Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r18663 -r18669
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18663)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18669)
@@ -1719,30 +1719,34 @@
 			}
 		}
 	}
-	if(material){
-		var amount = Ext.getCmp('materialAmount').getValue();
-		if(!amount || amount < 0){
-			showResultQM('输入的“'+material+'”的数量且不能小于1');
-			return false;
-		}
-		var position = Ext.getCmp("position").getValue();
-		materialInfo += material +"@"+ amount + "@" + position + "@" + 2 + ";";
-		if(tousseName){
-			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();
+	var qid = Ext.getCmp('id').getValue();
+	// 如果是重新打开的记录，不再校验材料和包的关系
+	if(isUndefinedOrNullOrEmpty(qid)){
+		if(material){
+			var amount = Ext.getCmp('materialAmount').getValue();
+			if(!amount || amount < 0){
+				showResultQM('输入的“'+material+'”的数量且不能小于1');
 				return false;
 			}
+			var position = Ext.getCmp("position").getValue();
+			materialInfo += material +"@"+ amount + "@" + position + "@" + 2 + ";";
+			if(tousseName){
+				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();
+					return false;
+				}
+			}
 		}
 	}
 	//是否选择监测项
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r18664 -r18669
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 18664)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 18669)
@@ -2147,38 +2147,41 @@
 			return false;
 		}
 	}
-	
-	if(material){
-		var amount = top.Ext.getCmp('amount2').getValue();
-		if(!amount || amount < 0){
-			showResult('输入的“'+material+'”的数量且不能小于1');
-			return false;
-		}
-		
-		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;
-					//对比 当前输入材料的数量 与 该器械包中此材料的数量
-					var v = r.data.count - amount;
-					if(v < 0){
-						showResult('输入的'+material+'的数量不能大于当前器械包该材料的数量');
-						top.Ext.getCmp('amount2').setValue(r.data.count);
-						return false;
+	var id2 = top.Ext.getCmp('id2').getValue();
+	if(isUndefinedOrNullOrEmpty(id2)){
+		if(material){
+			var amount = top.Ext.getCmp('amount2').getValue();
+			if(!amount || amount < 0){
+				showResult('输入的“'+material+'”的数量且不能小于1');
+				return false;
+			}
+			
+			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;
+						//对比 当前输入材料的数量 与 该器械包中此材料的数量
+						var v = r.data.count - amount;
+						if(v < 0){
+							showResult('输入的'+material+'的数量不能大于当前器械包该材料的数量');
+							top.Ext.getCmp('amount2').setValue(r.data.count);
+							return false;
+						}
 					}
 				}
+				if(!isExist){
+					showResult('在当前器械包中找不到找材料“'+material+'”');
+		            top.Ext.getCmp('material2').setValue('');
+					top.Ext.getCmp('amount2').setValue();
+					return false;
+				}
 			}
-			if(!isExist){
-				showResult('在当前器械包中找不到找材料“'+material+'”');
-	            top.Ext.getCmp('material2').setValue('');
-				top.Ext.getCmp('amount2').setValue();
-				return false;
-			}
 		}
 	}
+	
 	checkIsUniqueWithBarcodeAndInspectItemAndConvertToJson(thiz,top.Ext.getCmp('id2').getValue(),barcode,top.Ext.getCmp('formDefinitionId2').getValue());
 }