Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r17012 -r17218
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17012)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17218)
@@ -10,6 +10,7 @@
 var responPartName = '';
 var formDefinitionStore;
 var frequencyStore;
+var materialCountRecords;
 
 function cancelQualityMonitoring() {
 	qualityMonitoringWin.close();
@@ -516,10 +517,12 @@
 					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
 					top.Ext.getCmp('addExtractCheckMaterial').setVisible(true);
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					addMaterialAndAmount();
 				}else if(result.data.scope == "灭菌炉记录"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					// 如果监测范围为灭菌炉记录，隐藏器械包信息
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(false);
+					hideExtractCheckMaterial();
 				}else if(result.data.scope == "材料和器械包"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
@@ -538,6 +541,7 @@
 					showAllTousseOfSterileCheckBox(true);
 					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
 					top.Ext.getCmp('addExtractCheckMaterial').setVisible(true);
+					addMaterialAndAmount();
 				}else if(result.data.scope == "无"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
@@ -561,6 +565,7 @@
 						// 隐藏器械包信息
 						top.Ext.getCmp('tousseInfoFieldSet').setVisible(false);
 					}
+					hideExtractCheckMaterial();
 				}
 				// 新建质量监测单，数量默认为1
 				top.Ext.getCmp('amount').setValue(1);
@@ -572,6 +577,22 @@
 		}
 	});
 }
+// 装配页面进来，添加材料和数量
+function addMaterialAndAmount(){
+	if(materialCountRecords != null && materialCountRecords != 'undefined' && materialCountRecords.length > 0){
+		for(var i = 0 ; i < materialCountRecords.length ; i++){
+			var materialName = materialCountRecords[i].data["name"];
+			var count = materialCountRecords[i].data['count'];
+			if( i == 0){
+				// 第一条记录
+				top.Ext.getCmp('material').setValue(materialName);
+				top.Ext.getCmp('amount').setValue(count);
+			}else{
+				addExtractCheckMaterial(materialName,count);
+			}
+		}
+	}
+}
 function allTousseOfSterileChecked(){
 	var isAll = top.Ext.getCmp('isAllTousseOfSterile').getValue();   //是否整炉
 	if(isAll == '是'){
@@ -713,11 +734,14 @@
 	}
 }
 // 添加抽检器械和数量
-function addExtractCheckMaterial(){
+function addExtractCheckMaterial(mateialName,count){
 	materialItemCount++;
 	var setLeft = top.Ext.getCmp('setLeft');
 	var setRight = top.Ext.getCmp('setRight');
-	
+	var mCount = 1;
+	if(count != null && count != 'undefined'){
+		mCount = count;
+	}
 	var items = new Array();
 	var items1 = new Array();
 	var items2 = new Array();
@@ -731,6 +755,7 @@
 			minChars : 0,
 			valueField : 'id',
 			displayField : 'name',
+			value : mateialName,
 			store : materialDefinitionStore,
 			forceSelection : true,
 			lazyInit : true,
@@ -771,7 +796,7 @@
 			allowDecimals : false,
 			name : 'amount'+materialItemCount,
 			id : "amount"+materialItemCount,
-			value : 1,
+			value : mCount,
 			fieldLabel : "数量",
 			anchor : '95%'
 		};
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r17133 -r17218
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17133)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17218)
@@ -1390,23 +1390,36 @@
     ctx.tdAttr = " data-qtip = '"+Ext4.String.htmlEncode(tableContent)+"' data-qwidth=350 data-qtitle='<b><font style=\"color: green;\">质量、功能检查:</font><b>'"; 
     return v; 
 }
+	
 
+var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel');
+
 var materialGrid = new Ext4.grid.Panel({
 	id :'materialGrid',
     store: materialStore,
     height : document.body.clientHeight-20,
 	region: 'east',
 	margin: '0 0 0 0',
     width : '22%',
+    selModel: selModel,
     tbar:[{
     	xtype:'button',
     	id:"materialAmount"
     },'-',{
     	xtype:'button',
     	id:"diposableGoodsAmount"
+    },'-',{
+    	xtype:'button',
+    	text : '添加质量监测',
+    	hidden:SSTS_QualityRecord_Create,
+    	id:"addMaterialQualityMonitoring",
+    	handler: function(){
+    		materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+    		addQualityMonitoringByResponPart("清洗消毒");
+    	}
     }],
     columns: [
-         {hidden : true, dataIndex : 'materialDefinitionId'},     
+         {hidden : true, dataIndex : 'materialDefinitionId'},
          {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
       	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
     ],
@@ -1473,8 +1486,8 @@
     hidden:SSTS_QualityRecord_Create,
     iconCls : 'btn_ext_application_add',
     handler : function() {
-//    	addQualityMonitoring();
-    	addQualityMonitoringByResponPart("装配管理");
+    	materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+    	addQualityMonitoringByResponPart("清洗消毒");
     }
 },"-",{
     text : '打印回收清单',