Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r30631 -r30637
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30631)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30637)
@@ -2004,6 +2004,18 @@
 							}
 							getNextFocus(field);
 							field.setValue("");
+							var index = field.id.split('_')[0].replace('tempBarcode','');
+							if(Ext.getCmp('tousseDefinitionId'+index)){
+								Ext.getCmp('tousseDefinitionId'+index).setValue(result.tousseDefinitionId);
+							}
+							//重新加载包内的材料
+							if(materialItemCount > 0){
+								for(var i=1;i<=materialItemCount;i++){
+									if(Ext.getCmp('material'+index+'_'+i)){
+										Ext.getCmp('material'+index+'_'+i).store.reload();
+									}
+								}
+							}
 						}
 					}
 				},
@@ -2433,7 +2445,7 @@
 					addTousseClick = false;
 				}else if(result.data.scope== "材料"){
 					addExtractClick = true;
-					addExtractCheckMaterial("","",1,"","",true,"","","","","","");
+					addExtractCheckMaterial("","",1,"","",true,"","","","","","",tousseItemCount);
 					addExtractClick =  false;
 				}/* else if(result.data.scope == "灭菌炉记录"){
 					showResultQM('监测项为灭菌炉记录不能添加器械和器械包!');
@@ -2470,13 +2482,13 @@
 					Ext.getCmp('setLayout'+tousseAndMaterialWrapperCount+'_TMP').doLayout();
 					addExtractCheckTousse("","","","","","","",true,true,"",tosseAndMaterialId,"");
 					addTousseClick = false;
-					addExtractCheckMaterial("","",1,"","",true,true,"",tosseAndMaterialId,"","","");
+					addExtractCheckMaterial("","",1,"","",true,true,"",tosseAndMaterialId,"","","",tousseItemCount);
 					addExtractClick = false;
 					Ext.getCmp('addQualityMonitoringForm').doLayout();
 					
 				}else if(result.data.scope == "无"){
 					addExtractClick = true;
-					addExtractCheckMaterial("","",1,"","",true,"","","","","","");
+					addExtractCheckMaterial("","",1,"","",true,"","","","","","",tousseItemCount);
 					addExtractClick =  false;
 				}
 				
@@ -3782,7 +3794,7 @@
 			var orderNumber = qualityMonitoringGoodsList[i].orderNumber;
 			var position = qualityMonitoringGoodsList[i].position;
 			// 添加抽检器械和数量
-			addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true);
+			addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true,tousseItemCount);
 		}
 	}
 }
@@ -3868,7 +3880,7 @@
 			var amount = qualityMonitoringGoodsList[i].amount;
 			var position = qualityMonitoringGoodsList[i].position;
 			if(Ext.getCmp('material').getValue() != "" && mateialName != null && mateialName != ''){
-				addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true);
+				addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true,tousseItemCount);
 			}else if(Ext.getCmp('tousseName').getValue() != "" && tousseName != null && tousseName != ''){
 				var barcode = qualityMonitoringGoodsList[i].barcode;
 				var tousseInstanceId = qualityMonitoringGoodsList[i].tousseInstanceId;
@@ -3899,7 +3911,7 @@
 				var orderNumber = qualityMonitoringGoodsList[i].orderNumber;
 				var position = qualityMonitoringGoodsList[i].position;
 				// 添加抽检器械和数量
-				addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true);
+				addExtractCheckMaterial(true,mateialName,amount,position,orderNumber,"","","","","","",true,tousseItemCount);
 			}
 		}
 	}