Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r41419 -r41422
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41419)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41422)
@@ -548,6 +548,7 @@
 			})
 		} else {
 			if (inspectMaterialRequired == '是') {
+				showResultQM('抽检器械不能为空！');
 				return false;
 			}
 		}
@@ -567,6 +568,7 @@
 				}
 			}
 			if (isNull) {
+				showResultQM('抽检器械不能为空！');
 				return false;
 			}
 		}
@@ -588,6 +590,7 @@
 					firstMaterialInfos = firstMaterialInfos.concat(tousseBags[i].materialInfos)
 				}
 				if (isNull) {
+					showResultQM('抽检器械不能为空！');
 					return false;
 				}
 			}
@@ -761,7 +764,7 @@
 function showRecordMaterialDetails(id, filedIndex, optionId, optionsLength) {
 	var tousseAndMaterialAllData = getAllTousseAndMaterialData();
 	if (!tousseAndMaterialAllData || tousseAndMaterialAllData.length == 0) {
-		showResultQM('器械包或者器械不能为空！');
+		showResultQM('器械包不能为空！');
 		return
 	}
 	var scope = Ext.getCmp('scope').getValue();
@@ -5688,10 +5691,13 @@
 }
 function getTousseAndMaterialAll() {
 	var allTousseData = getAllTousseAndMaterialData();
-	if(!allTousseData || allTousseData.length == 0){
-		showResultQM('器械包或者器械不能为空！');
+	if(!allTousseData){
 		return
 	}
+	if(allTousseData.length == 0){
+		showResultQM('器械包不能为空！');
+		return
+	}
 	var tousseAndMaterialAll = {};
 	var tousseInstanceInfos = [];
 	var tousseAndMaterialWrapperCountNum = tousseItemCount;//获取添加的块数量