Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js
===================================================================
diff -u -r27263 -r28138
--- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 27263)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 28138)
@@ -193,7 +193,7 @@
 	return false;
 }
 
-function addAndEditRecyclingDamageRecord(id, linkType, param) {
+function addAndEditRecyclingDamageRecord(id, linkType, param, materialGrid, lastSelectTousseName) {
 	var tempAmount = 0;
 	var tousseStore = tousseStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -629,9 +629,21 @@
 						    }]
 						}),
 					listeners:{
+						render:function(){
+							if(materialGrid.length > 0){
+								for(var i=0;i<materialGrid.length;i++){
+									var tempTousseName = lastSelectTousseName;
+									var tempMaterial = materialGrid[i].data.name;
+									var tempCount = materialGrid[i].data.count;
+									var materialDefintionId = materialGrid[i].data.materialDefinitionId;
+						
+									addItemToGrid(tempTousseName, tempMaterial, tempCount, tempCount, materialDefintionId, false);
+								}
+							}
+						},
 				   		beforeedit : function(e){//
-				   			tempAmount = e.record.data['amount'];
-			   			},
+							tempAmount = e.record.data['amount'];
+						},
 			   			afteredit : function(e) {
 			   				if(e.value<1){
 			   					showResult("输入数量不能小于1！" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -733,7 +745,7 @@
 									return;
 				   				}
 			   				}
-			   			}
+						}
 			   		}
 				})]
             }]
Index: ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js
===================================================================
diff -u -r27263 -r28138
--- ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js	(.../recyclingLostRecordForm.js)	(revision 27263)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js	(.../recyclingLostRecordForm.js)	(revision 28138)
@@ -193,7 +193,7 @@
 	return false;
 }
 
-function addAndEditRecyclingLostRecord(id, linkType, param) {
+function addAndEditRecyclingLostRecord(id, linkType, param, materialGrid, lastSelectTousseName) {
 	var tempAmount = 0;
 	var tousseLostStore = tousseLostStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -629,6 +629,18 @@
 						    }]
 						}),
 					listeners:{
+						render:function(){
+							if(materialGrid.length > 0){
+								for(var i=0;i<materialGrid.length;i++){
+									var tempTousseName = lastSelectTousseName;
+									var tempMaterial = materialGrid[i].data.name;
+									var tempCount = materialGrid[i].data.count;
+									var materialDefintionId = materialGrid[i].data.materialDefinitionId;
+						
+									addItemToGrid2(tempTousseName, tempMaterial, tempCount, tempCount, materialDefintionId, false);
+								}
+							}
+						},
 				   		beforeedit : function(e){//
 				   			tempAmount = e.record.data['amount'];
 			   			},
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28130 -r28138
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28130)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28138)
@@ -2471,14 +2471,16 @@
     hidden : SSTS_QualityRecord_Create,
     iconCls : 'btn_ext_application_add',
     handler : function() {
-        addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD);
+    	var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+    	addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD,{},materialGrid,lastSelectTousseName);
     }
 },"-",{
     text : '添加丢失器械',
     //hidden : SSTS_QualityRecord_Create,
     iconCls : 'btn_ext_application_add',
     handler : function() {
-        addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR);
+    	var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+    	addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR,{},materialGrid,lastSelectTousseName);
     }
 },"-",{
     text : '质量监测',