Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r34681 -r34692
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34681)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34692)
@@ -103,7 +103,7 @@
 	if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){
 		consumptiveMaterialUseData.push(['灭菌耗材']);
 	}
-	
+
 	//耗材用途
 	var consumptiveMaterialUseStore = new Ext.data.SimpleStore( {
 		fields : [ 'value'],
@@ -1051,177 +1051,30 @@
 					showResult("请选择要打印的批次！");
 					return false;
 				}
-				if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){
-					DWREngine.setAsync(false);
-					SupplyRoomConfigTableManager.getStartTimeObject(function (supplyRoomConfig) {
-						unitName = supplyRoomConfig.unitName;
-					})
-					DWREngine.setAsync(true);
-					var formPanel = new top.Ext.FormPanel({
-						id: 'formPanel',
-						frame: true,
-						labelAlign: 'right',
-						labelSeparator: '：',
-						bodyStyle: 'padding:5px 5px 0px 5px',
-						labelWidth: 80,
-						autoHeight: true,
-						autoScroll: true,
-						items: [{
-							layout : 'column',
-							items:[{
-								layout : 'form',
-								labelWidth:93,
-								labelAlign:'left',
-								columnWidth: 1,
-								items : [{
-									xtype : 'textfield',
-									columnWidth: 1,
-									disable:true,
-									fieldLabel:'监测包类型',
-									cls : 'fieldReadOnlyNoRemove',
-									width:0
-								}]
-							},{
-								layout : 'form',
-								labelWidth:100,
-								labelAlign:'right',
-								columnWidth: .5,
-								items : [{
-									id : 'monitorTousseType_1',
-									name : 'monitorTousseType_1',
-									columnWidth: .5,
-									fieldLabel :  '化学监测包',
-									xtype : 'checkbox',
-									inputValue :  '化学监测包',
-									labelSeparator:''
-								}]
-							},{
-								layout : 'form',
-								labelWidth:100,
-								labelAlign:'right',
-								columnWidth: .5,
-								items : [{
-									id : 'monitorTousseType_2',
-									name : 'monitorTousseType_2',
-									columnWidth: .5,
-									fieldLabel :  '生物监测包',
-									xtype : 'checkbox',
-									inputValue :  '生物监测包',
-									labelSeparator:''
-								}]
-							},{
-								layout : 'form',
-								labelWidth:80,
-								labelAlign:'left',
-								columnWidth: 1,
-								items : [{
-									xtype : 'textfield',
-									columnWidth: 1,
-									disable:true,
-									fieldLabel:'打印份数',
-									cls : 'fieldReadOnlyNoRemove',
-									width:0
-								}]
-							},{
-								layout : 'form',
-								labelWidth:35,
-								labelAlign:'left',
-								columnWidth: 1,
-								items : [{
-									xtype : 'numberfield',
-									columnWidth: 1,
-									labelSeparator:'',
-									id:'printAmount',
-									width:180,
-									value:1,
-									name:'printAmount',
-									allowDecimals : false,
-									allowNegative : false
-								}]
-							}]
-						}],
-						buttons: [{
-							id: 'continueBtn',
-							text: '确认',
-							handler: function () {
-								var monitorTousseType_1 = top.Ext.getCmp('monitorTousseType_1').getValue();
-								var monitorTousseType_2 = top.Ext.getCmp('monitorTousseType_2').getValue();
-								if(!monitorTousseType_1 && !monitorTousseType_2){
-									showMultipleResult('请选择监测包类型');
-									return
-								}
-	
-								var printAmount = top.Ext.getCmp('printAmount').getValue();
-								if(printAmount == 0){
-									showMultipleResult('打印份数不能小于1');
-									return;
-								}else if(printAmount > 500){
-									showMultipleResult('打印份数不能超过500');
-									return;
-								}
-								if (isNaN(printAmount) == false) {
-									for(var i=0;i<records.length;i++){
-										var barcode = records[i].data.barcode;
-										if(monitorTousseType_1){
-											var type = top.Ext.getCmp('monitorTousseType_1').inputValue;
-											print_container(barcode, type, unitName);
-										}
-		
-										if(!monitorTousseType_1 && monitorTousseType_2){
-											var type = top.Ext.getCmp('monitorTousseType_2').inputValue;
-											print_container(barcode, type, unitName);
-										}
-									}
-								}else {
-									showMultipleResult("打印份数必须是数字，请重新输入!");
-								}
-							}
-						}, {
-							text: '取消',
-							id: 'cancleBtn',
-							handler: function () {
-								printWin.close();
-							}
-						}]
-					});
-					var printWin = new top.Ext.Window({
-						id: 'printWin',
-						layout: 'fit',
-						title: '输入打印份数',
-						width: 300,
-						border: false,
-						modal: true,
-						autoHeight: true,
-						plain: true,
-						items: [formPanel]
-					});
-					printWin.show();
-				}else {
-					for ( var i = 0, len = records.length; i < len; i++) {
-						if(items == null){
-							items = records[i].data.id; 
-						}else {
-							items += ',' + records[i].data.id; 
-						}
+				for ( var i = 0, len = records.length; i < len; i++) {
+					if(items == null){
+						items = records[i].data.id; 
+					}else {
+						items += ',' + records[i].data.id; 
 					}
-					top.Ext.getCmp("items").setValue(items);
-					formObj.form.submit({
-						url : WWWROOT + '/disinfectSystem/diposableGoodsAction!printDiposableGoods.do',
-						method : 'POST',
-						waitMsg : '正在保存数据，请稍候',
-						waitTitle : '提交表单',
-						success : function(form, action) {
-							window.close();
-							grid.dwrReload();
-							//打印条码
-							printBarcode(action.result.barcode);
-	
-						},
-						failure : function(form, action) {
-							showResult(action.result.message);
-						}
-					});
 				}
+				top.Ext.getCmp("items").setValue(items);
+				formObj.form.submit({
+					url : WWWROOT + '/disinfectSystem/diposableGoodsAction!printDiposableGoods.do',
+					method : 'POST',
+					waitMsg : '正在保存数据，请稍候',
+					waitTitle : '提交表单',
+					success : function(form, action) {
+						window.close();
+						grid.dwrReload();
+						//打印条码
+						printBarcode(action.result.barcode);
+
+					},
+					failure : function(form, action) {
+						showResult(action.result.message);
+					}
+				});
 			}
 		},{
 			id : 'printFiexdBarcode',
@@ -1308,7 +1161,9 @@
 								var batchNumber = resultItem[4];
 								var externalCode = resultItem[5];
 								if(!externalCode || externalCode == ''){
-									externalCode = top.Ext.getCmp("externalCode").getValue() || '';
+									if(sstsConfig.externalCodeConfig && sstsConfig.externalCodeConfig.hidden == false && top.Ext.getCmp("externalCode")){
+										externalCode = top.Ext.getCmp("externalCode").getValue() || '';
+									}
 								}
 								printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,specification,externalCode);
 							}
@@ -1492,7 +1347,9 @@
 								var specification = resultItem[5];
 								var externalCode =  resultItem[6];
 								if(!externalCode || externalCode == ''){
-									externalCode = top.Ext.getCmp("externalCode").getValue() || '';
+									if(sstsConfig.externalCodeConfig && sstsConfig.externalCodeConfig.hidden == false && top.Ext.getCmp("externalCode")){
+										externalCode = top.Ext.getCmp("externalCode").getValue() || '';
+									}
 								}
 								printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,specification,externalCode);
 							}