Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
===================================================================
diff -u -r31458 -r35049
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp	(.../qualitymonitoringInstanceView.jsp)	(revision 31458)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp	(.../qualitymonitoringInstanceView.jsp)	(revision 35049)
@@ -29,7 +29,6 @@
 var userName = '<%=request.getAttribute("userName")%>';
 var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
-
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}" /></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r35046 -r35049
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35046)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35049)
@@ -1129,7 +1129,7 @@
    amountChild          当前在信息块里面是第几个
    isLoad               是否是加载
  */
-function addExtractCheckMaterial(isOpenRecord,mateialName,count,basketPosition,orderNumber,isWrapper,isTousseAndMaterial,amount,tosseAndMaterialId,btnShowOrHide,amountChild,isLoad,tousseItemCount){
+function addExtractCheckMaterial(isOpenRecord,mateialName,count,basketPosition,orderNumber,isWrapper,isTousseAndMaterial,amount,tosseAndMaterialId,btnShowOrHide,amountChild,isLoad,tousseItemCount,tousseDefinitionId){
 	materialItemCount++;
 	var tousseAndMaterial = top.Ext.getCmp('tosseAndMaterial');
 	var mCount = 1;
@@ -1162,10 +1162,14 @@
 		]),
 		listeners : {
 			beforeload : function(thiz, options){
-				if(tousseItemCount == 0){
-					thiz.baseParams['tousseDefinitionId'] = top.Ext.getCmp('tousseDefinitionId').getValue();	
-				}else if(tousseItemCount !== undefined){
-					thiz.baseParams['tousseDefinitionId'] = top.Ext.getCmp('tousseDefinitionId'+tousseItemCount).getValue();
+				if(tousseDefinitionId){
+					thiz.baseParams['tousseDefinitionId'] = tousseDefinitionId;
+				}else {
+					if(tousseItemCount == 0){
+						thiz.baseParams['tousseDefinitionId'] = top.Ext.getCmp('tousseDefinitionId').getValue();	
+					}else if(tousseItemCount !== undefined){
+						thiz.baseParams['tousseDefinitionId'] = top.Ext.getCmp('tousseDefinitionId'+tousseItemCount).getValue();
+					}
 				}
 			} 
 		}
@@ -2463,43 +2467,48 @@
 					scope = top.Ext.getCmp('scope').getValue();
 				}
 				if(scope == '器械包'){
-					for(var i=0;i<tousseItems.length;i++){
-						arr[i] = {
-							barcode:tousseItems[i].data.barcode,
-							tousseInstanceId:tousseItems[i].data.id,
-							tousseName:tousseItems[i].data.tousseDefinitionName + '（'+tousseItems[i].data.barcode+'）',
-							amount:tousseItems[i].data.amount,
-							orderNumber:i,
-							isRecycle:'否',
-							isRePacking:'否',
-							isDiscard:'否',
-							scope:scope,
-							showInput:true
-						};
-					}
-					loadTousseMsg({},arr);
-					enableRecycleAndRepacking();
-					top.Ext.getCmp('disabledBarcode').enable();
-				}else if(scope == '材料和器械包'){
-					if(tousseItems.length > 0){
-						for(var i=0;i<tousseItems.length;i++){
-							arr[i] = {
+					for(var i=0,k=1;i<tousseItems.length;i++){
+						if(tousseItems[i].data.tousseType !== '一次性物品'){
+							arr.push({
 								barcode:tousseItems[i].data.barcode,
 								tousseInstanceId:tousseItems[i].data.id,
 								tousseName:tousseItems[i].data.tousseDefinitionName + '（'+tousseItems[i].data.barcode+'）',
 								amount:tousseItems[i].data.amount,
-								orderNumber:(i+1),
+								orderNumber:k,
 								isRecycle:'否',
 								isRePacking:'否',
 								isDiscard:'否',
 								scope:scope,
 								showInput:true
-							};
+							});
+							k++
 						}
-						loadMateriaAndTousselMsg({},arr);
-						if(tousseItems.length > 1){
-							addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",1);
+					}
+					loadTousseMsg({},arr);
+					enableRecycleAndRepacking();
+					top.Ext.getCmp('disabledBarcode').enable();
+				}else if(scope == '材料和器械包'){
+					if(tousseItems.length > 0){
+						for(var i=0,lk=1;i<tousseItems.length;i++){
+							if(tousseItems[i].data.tousseType !== '一次性物品'){
+								var result = getTousseInstanceMsg(tousseItems[i].data.barcode);
+								arr.push({
+									barcode:tousseItems[i].data.barcode,
+									tousseInstanceId:tousseItems[i].data.id,
+									tousseDefinitionId:result.tousseDefinitionId,
+									tousseName:tousseItems[i].data.tousseDefinitionName + '('+tousseItems[i].data.barcode+')',
+									amount:tousseItems[i].data.amount,
+									orderNumber:k,
+									isRecycle:'否',
+									isRePacking:'否',
+									isDiscard:'否',
+									scope:scope,
+									showInput:true
+								});
+								k++
+							}
 						}
+						loadMateriaAndTousselMsg({},arr);
 						enableRecycleAndRepacking();
 						top.Ext.getCmp('disabledBarcode').enable();
 					}
@@ -4135,11 +4144,15 @@
 				var isDiscard = qualityMonitoringGoodsList[i].isDiscard;
 				var showInput = qualityMonitoringGoodsList[i].showInput;
 				var scope = qualityMonitoringGoodsList[i].scope;
+				var tousseDefinitionId = qualityMonitoringGoodsList[i].tousseDefinitionId;
 				if(!showInput){
 					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true);
 				}else if(scope == '器械包' || scope == '材料和器械包'){
 					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true,showInput);
 				}
+				if(scope == '材料和器械包' && showInput == true){
+					addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",orderNumber,tousseDefinitionId);
+				}
 			}else{
 				top.Ext.getCmp('material').setValue(mateialName);
 				top.Ext.getCmp('materialAmount').setValue(amount);
@@ -4159,11 +4172,15 @@
 				var isDiscard = qualityMonitoringGoodsList[i].isDiscard;
 				var showInput = qualityMonitoringGoodsList[i].showInput;
 				var scope = qualityMonitoringGoodsList[i].scope;
+				var tousseDefinitionId = qualityMonitoringGoodsList[i].tousseDefinitionId;
 				if(!showInput){
 					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true);
 				}else if(scope == '器械包' || scope == '材料和器械包'){
 					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true,showInput);
 				}
+				if(scope == '材料和器械包' && showInput == true){
+					addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",orderNumber,tousseDefinitionId);
+				}
 			}else if(mateialName != null && mateialName != ''){
 				var amount = qualityMonitoringGoodsList[i].amount;
 				var orderNumber = qualityMonitoringGoodsList[i].orderNumber;
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r35046 -r35049
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35046)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35049)
@@ -2296,7 +2296,7 @@
 			}
 		},
 		{
-			header: "数量", dataIndex: 'amount', width: 30, menuDisabled: true, editor: new Ext.form.NumberField({
+			header: "数量", dataIndex: 'amount', width: 30, menuDisabled: true, editor: new top.Ext.form.NumberField({
 				allowBlank: false,
 				listeners: {
 					focus: function (thiz) {