Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r34071 -r34078
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 34071)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 34078)
@@ -628,7 +628,7 @@
   		}
     ]
 },{
-	text:"设备耗材管理",
+	text:"设备耗材消耗管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:!sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction,
 	children:[
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r33565 -r34078
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 33565)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 34078)
@@ -39,6 +39,7 @@
 	var YOUYUAN_YZQ_230 = '<%= DeviceInterface.YOUYUAN_YZQ_230 %>';
 	var STERIS = '<%= DeviceInterface.STERIS %>';
 	var STERIS_AMSCO_3052 = '<%= DeviceInterface.STERIS_AMSCO_3052 %>';
+	var fontSize = '{fontSize}';
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r34037 -r34078
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 34037)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 34078)
@@ -648,6 +648,61 @@
 	
 }
 
+function loadRinserBindConsumptiveMaterialContainer(value,isShow){
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/consumptiveMaterialContainerAction!loadRinserBindConsumptiveMaterialContainer.do',
+		params: {
+			rinserName: value
+		},
+		success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			if (result.success) {
+				var consumptiveMaterialVolumes = result.consumptiveMaterialVolumes || '';
+				top.Ext.getCmp('totalAmount').setValue(consumptiveMaterialVolumes);
+				top.Ext.getCmp('consumptiveMaterialContainerId').setValue(result.consumptiveMaterialContainerId)
+				if(consumptiveMaterialVolumes !== '' && isShow == true){
+					top.Ext.getCmp('hiddenBox1').show();
+				}else {
+					top.Ext.getCmp('hiddenBox1').hide();
+				}
+			}else {
+				top.Ext.getCmp('hiddenBox1').hide();
+			}
+		},
+		failure: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult("系统加载失败，请稍候再试");
+		}
+	})
+}
+
+function getCleanMethodConsumptionVolume(id){
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/cleanMethodAction!getCleanMethodConsumptionVolume.do',
+		params: {
+			id: id
+		},
+		success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			if (result.success) {
+				var consumptiveMaterialVolumes = result.consumptiveMaterialVolumes || '';
+				if(consumptiveMaterialVolumes !== ''){
+					top.Ext.getCmp('consumptiveMaterialVolumes').setValue(consumptiveMaterialVolumes);
+					top.Ext.getCmp('hiddenBox2').show();
+				}else {
+					top.Ext.getCmp('hiddenBox2').hide();
+				}
+			}else {
+				top.Ext.getCmp('hiddenBox2').hide();
+			}
+		},
+		failure: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult("系统加载失败，请稍候再试");
+		}
+	})
+}
+
 var washBasketTreePanelTitle = '清洗篮筐';
 var oldRinserName = '';
 var oldDisinfectProgram = '';
@@ -784,6 +839,14 @@
 //	pendingWashAndDisinfectColumnTree.loader.load(pendingWashAndDisinfectColumnTree.root,function(){});
 	fieldsetHeight = (!!window.ActiveXObject || "ActiveXObject" in window || window.navigator.userAgent.indexOf("MSIE") >= 1) ? 185 : 210;
 	
+	if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+		if(fontSize == 12){
+			fieldsetHeight += 40;
+		}else {
+			fieldsetHeight += 60;
+		}
+	}
+	
 	formObj = new top.Ext.FormPanel({
 		id : 'washForm',
 		frame : true,
@@ -806,7 +869,7 @@
 					height: fieldsetHeight,
 					columnWidth : 1,
 //					autoHeight : true,
-					labelWidth : 95,
+					labelWidth: 105,
 					items : [{
 						layout : 'column',
 						items : [{
@@ -1067,6 +1130,10 @@
 										        }
 											});
 											DWREngine.setAsync(true);
+
+											if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+												loadRinserBindConsumptiveMaterialContainer(value,true);
+											}
 //										}
 									}
 								},
@@ -1125,6 +1192,11 @@
 												top.Ext.getCmp('cleanParameter').setValue(result);
 											}
 										});
+
+										var consumptiveMaterialContainerId = top.Ext.getCmp('consumptiveMaterialContainerId').getValue() || '';
+										if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction && consumptiveMaterialContainerId !== ''){
+											getCleanMethodConsumptionVolume(record.data.id);
+										}
 										
 									}
 								},
@@ -1166,7 +1238,51 @@
 								anchor : '100%',
 								cls:'edit-5char-labelwidth'
 							}]
+						}, {
+							columnWidth: 1,
+							layout: 'form',
+							id:'hiddenBox1',
+							items: [{
+								xtype:'hidden',
+								id:'consumptiveMaterialContainerId',
+								name:'consumptiveMaterialContainerId'
+							},{
+								xtype: 'textfield',
+								fieldLabel: "设备耗材余量",
+								name: "totalAmount",
+								id: "totalAmount",
+								readOnly: true,
+								cls : 'fieldReadOnlyNoRemove',
+								anchor: '99%'
+							}],
+							listeners:{
+								render:function(){
+									setTimeout(function(){
+										top.Ext.getCmp('hiddenBox1').hide();
+									}, 100);
+								}
+							}
 						},{
+							columnWidth: 1,
+							layout: 'form',
+							id:'hiddenBox2',
+							items: [{
+								xtype: 'textfield',
+								fieldLabel: "本次耗材消耗",
+								name: "consumptiveMaterialVolumes",
+								id: "consumptiveMaterialVolumes",
+								readOnly: true,
+								cls : 'fieldReadOnlyNoRemove',
+								anchor: '99%'
+							}],
+							listeners:{
+								render:function(){
+									setTimeout(function(){
+										top.Ext.getCmp('hiddenBox2').hide();
+									}, 100);
+								}
+							}
+						},{
 							columnWidth : 1,
 							layout : 'form',
 							items : [{
@@ -1177,6 +1293,21 @@
 								readOnly:true,
 								anchor : '99%'
 							}]
+						},{
+							id : "cycleCounterId",
+							columnWidth : .33,
+							layout : 'form',
+							cls:'edit-5char-labelwidth',
+							items : [{
+								xtype : 'textfield',
+								fieldLabel : "循环次数",
+								name : "cycleCounter",
+								id : "cycleCounter",
+								allowBlank : false,
+								readOnly : false,
+								anchor : '100%',
+								cls:'edit-5char-labelwidth'
+							}]
 						}]
 					}]
 				},{
@@ -1281,10 +1412,57 @@
 				if(materialStore.getCount() == 0 && root.childNodes.length == 0){
 					top.Ext.MessageBox.confirm("请确认", "没有添加清洗的物品，继续清洗吗？",function (button, text) {
 						if ("yes" == button) {
-							that.disable();
-							var success = save();
-							if(!success){
-								that.enable();
+							if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+								var totalAmount = top.Ext.getCmp('totalAmount').getValue();
+								var consumptiveMaterialContainerId = top.Ext.getCmp('consumptiveMaterialContainerId').getValue();
+								if(consumptiveMaterialContainerId !== '' && totalAmount == ''){
+									top.Ext.MessageBox.confirm("请确认", "当前设备绑定的清洗耗材容器没有配置清洗耗材，是否继续操作？", function (button, text) {
+										if ("yes" == button) {
+											that.disable();
+											var success = save();
+											if (!success) {
+												that.enable();
+											}
+										} else {
+											return false;
+										}
+									});
+								}else {
+									if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+										var totalAmount = top.Ext.getCmp('totalAmount').getValue();
+										if(totalAmount == ''){
+											top.Ext.MessageBox.confirm("请确认", "当前设备绑定的清洗耗材容器没有配置清洗耗材，是否继续操作？", function (button, text) {
+												if ("yes" == button) {
+													that.disable();
+													var success = save();
+													if (!success) {
+														that.enable();
+													}
+												} else {
+													return false;
+												}
+											});
+										}else {
+											that.disable();
+											var success = save();
+											if (!success) {
+												that.enable();
+											}
+										}
+									}else {
+										that.disable();
+										var success = save();
+										if (!success) {
+											that.enable();
+										}
+									}
+								}
+							}else {
+								that.disable();
+								var success = save();
+								if (!success) {
+									that.enable();
+								}
 							}
 						} else {
 							return false;
@@ -1397,6 +1575,15 @@
 						 }
 					 });
 				}
+
+				if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+					loadRinserBindConsumptiveMaterialContainer(rinserName,false);
+					var cleanMethodConsumptionVolumeStr = action.result.data.cleanMethodConsumptionVolumeStr || '';
+					if(cleanMethodConsumptionVolumeStr !== ''){
+						top.Ext.getCmp('consumptiveMaterialVolumes').setValue(cleanMethodConsumptionVolumeStr);
+						top.Ext.getCmp('hiddenBox2').show();
+					}
+				}
 			}
 			var value = top.Ext.getCmp('disinfectProgram').getRawValue();
 			WashAndDisinfectRecordTableManager.getCleanParameter(value,function(result){
@@ -1643,10 +1830,13 @@
 		success : function(form, action) {
 			var validate = Ext.decode(action.result.success);
 			if(validate){
-				Ext.getCmp('washSaveSubmitResult').setValue("1");
-				showResult(action.result.message);
-				grid.dwrReload();
-				washAndDisinfectRecordWin.close();
+				if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+					var totalAmount = top.Ext.getCmp('totalAmount').getValue() || '';
+					var consumptiveMaterialContainerId = top.Ext.getCmp('consumptiveMaterialContainerId').getValue();
+					if(consumptiveMaterialContainerId == '' && totalAmount == ''){
+						showResult('该设备没有绑定清洗耗材容器');
+					}
+				}
 			}else{
 				showResult(action.result.message);
 				Ext.getCmp('washSaveSubmitResult').setValue("-1");