Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30136 -r30205
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30136)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30205)
@@ -2446,13 +2446,27 @@
     		materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
 			otherPartAddQM = true;
 			var washRecordIds = getWashRecordIds();
+			var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
+			var map = {},tousseItems = [];
+			Ext4.each(records, function(pNode){
+				if(pNode.childNodes.length == 0){
+					var ai = pNode;
+					if(!map[ai.get('tousseName')]){
+						tousseItems.push({
+							tousseName:ai.parentNode.get('tousseName'),
+							tousseID:ai.parentNode.get('tousseID')
+						});
+						map[ai.get('tousseName')] = ai;
+					}
+				}
+			});
 			if(washRecordIds.length > 1){
-				addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]);
+				addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems);
 				showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 			}else if(washRecordIds.length == 1){
-				addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]);
+				addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems);
 			}else {
-				addQualityMonitoringByResponPart("清洗消毒");
+				addQualityMonitoringByResponPart("清洗消毒",'',tousseItems);
 			}
     	}
     }],
@@ -2572,14 +2586,28 @@
     handler : function() {
     	materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
     	otherPartAddQM = true;
-    	var washRecordIds = getWashRecordIds();
+		var washRecordIds = getWashRecordIds();
+		var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
+		var map = {},tousseItems = [];
+		Ext4.each(records, function(pNode){
+			if(pNode.childNodes.length == 0){
+				var ai = pNode;
+				if(!map[ai.get('tousseName')]){
+					tousseItems.push({
+						tousseName:ai.parentNode.get('tousseName'),
+						tousseID:ai.parentNode.get('tousseID')
+					});
+					map[ai.get('tousseName')] = ai;
+				}
+			}
+		});
 		if(washRecordIds.length > 1){
-			addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]);
+			addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems);
 			showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 		}else if(washRecordIds.length == 1){
-			addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]);
+			addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems);
 		}else {
-			addQualityMonitoringByResponPart("清洗消毒");
+			addQualityMonitoringByResponPart("清洗消毒",'',tousseItems);
 		}
     }
 }/* ,"-",{
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r30012 -r30205
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30012)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30205)
@@ -2244,10 +2244,11 @@
 /**
  * 通过生产环节添加质量监测,装配界面
  * @param {生产环节的名称} responPartName 
- * @param {清洗记录的ID} washRecordId 
+ * @param {清洗记录的ID} washRecordId
+ * @param {选中的器械包数组} tousseItems
  */
-function addQualityMonitoringByResponPart(responPartName,washRecordId) {
-	addQualityMonitoring('','','',washRecordId);
+function addQualityMonitoringByResponPart(responPartName,washRecordId,tousseItems) {
+	addQualityMonitoring('','','',washRecordId,tousseItems);
 	Ext.getCmp('responsibilityPart').setValue(responPartName);
 	otherPartAddQM = true;
 	formDefinitionStore.baseParams.responsiblePerson = responPartName;
@@ -2605,8 +2606,9 @@
  * @param {质量监测定义id} formDefinitionId 
  * @param {质量监测定义名称} formDefinitionName 
  * @param {清洗记录的ID} washRecordId 
+ * @param {选中的器械包数组} tousseItems 
  */
-function addQualityMonitoring(id,formDefinitionId,formDefinitionName,washRecordId) {
+function addQualityMonitoring(id,formDefinitionId,formDefinitionName,washRecordId,tousseItems) {
 	if(id==null||id=='undentified'){
 		id="";
 	}
@@ -2629,7 +2631,17 @@
 		border : false,
 	    plain : true,
 		draggable:false,
-		items : [ formPanel ]
+		items : [ formPanel ],
+		listeners:{
+			render:function(){
+				setTimeout(function(){
+					if(tousseItems && tousseItems.length > 0){
+						Ext.getCmp('tousseDefinitionId').setValue(tousseItems[0].tousseID);
+						Ext.getCmp('tousseName').setValue(tousseItems[0].tousseName);
+					}
+				}, 1000);
+			}
+		}
 	});
 	qualityMonitoringWin.show();
 	if(id != null && id != ''){
@@ -4137,6 +4149,8 @@
 												Ext.getCmp('cleaningEndTime').setValue(record.endDate);
 												Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID);
 												Ext.getCmp('responsiblePerson').setValue(record.personInCharge);
+												Ext.getCmp('tousseDefinitionId').setValue(record.lastTousseInstanceId || '');
+												Ext.getCmp('tousseName').setValue(record.tousseName || '');
 											}
 										}
 									},
@@ -4180,7 +4194,6 @@
 					name : 'cleaningMachinePosition',
 					id : 'cleaningMachinePosition',
 					fieldLabel : "位置",
-					disabled:true,
 					anchor : '95%'
 				}]
 			},{