Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12952 -r12959
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12952)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12959)
@@ -1,4 +1,4 @@
-var entityName = "入库单管理";
+var entityName = "入库单";
 var grid;
 var batchNumStore;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
@@ -1257,67 +1257,67 @@
 	});
 }
 // 打印，目前只支持单个打印
-function batchPrintGodownEntrys(ids, printType){
-	  if(ids == null)
-	       return;
-	  top.Ext.MessageBox.show({
-	      title:'请等待',
-	      msg:'打印中……',
-	      width:350,
-	      progress:true,
-	      closable:false
-	  });
-	  Ext.Ajax.timeout=300*000;
-	  Ext.Ajax.request({
-		  timeout: 300*000,
-	      url : WWWROOT + '/disinfectSystem/godownEntryAction!mergeLoadToussePrintData.do',
-	      params : {ids : ids},
-	      success : function(response){
-	    	  var result = Ext.decode(response.responseText);
-//	    	  	result.depart = depart;
-//	    	  	result.departBarcode = departBarcode;
-	    		result.printUser = curUserName;
-	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
-	    		// 发料人默认改为当前用户
-	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
-	    			result.sender = curUserName;
-	    		}
-	    		printGodownEntrys(result, printType);
-	    	  
-	    	  if (printType == 0){
-//	    		  updatePrintStatus(ids);
-	    	  }
-	    	  
-	          hideMessageBox(true);
-	      },
-	      failure: function(response){
-	          showResult("打印失败！");
-	          hideMessageBox(true);
-	      }
-	  });
-}
+//function batchPrintGodownEntrys(ids, printType){
+//	  if(ids == null)
+//	       return;
+//	  top.Ext.MessageBox.show({
+//	      title:'请等待',
+//	      msg:'打印中……',
+//	      width:350,
+//	      progress:true,
+//	      closable:false
+//	  });
+//	  Ext.Ajax.timeout=300*000;
+//	  Ext.Ajax.request({
+//		  timeout: 300*000,
+//	      url : WWWROOT + '/disinfectSystem/godownEntryAction!mergeLoadToussePrintData.do',
+//	      params : {ids : ids},
+//	      success : function(response){
+//	    	  var result = Ext.decode(response.responseText);
+////	    	  	result.depart = depart;
+////	    	  	result.departBarcode = departBarcode;
+//	    		result.printUser = curUserName;
+//	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
+//	    		// 发料人默认改为当前用户
+//	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
+//	    			result.sender = curUserName;
+//	    		}
+//	    		printGodownEntrys(result, printType);
+//	    	  
+//	    	  if (printType == 0){
+////	    		  updatePrintStatus(ids);
+//	    	  }
+//	    	  
+//	          hideMessageBox(true);
+//	      },
+//	      failure: function(response){
+//	          showResult("打印失败！");
+//	          hideMessageBox(true);
+//	      }
+//	  });
+//}
 
-function printGodownEntrys(godownEntrysInfo, printType) {
-	godownEntrysInfo.applicationType = "一次性物品入库单";
-//	godownEntrysInfo.barcode = godownEntrysInfo.departBarcode;
-	godownEntrysInfo.formTypeOfPrinted = 'godownEntry';
-	var unitName = "";
-//  DWREngine.setAsync(false);
-//  SupplyRoomConfigTableManager.getStartTimeObject(function(config){
-//      if(config != null){
-//      	unitName = config.unitName;
-//      }
-//  });
-//  DWREngine.setAsync(true);
-	godownEntrysInfo.unitName = unitName;
-//  godownEntrysInfo.printConfigObj_default = batchPrintGodownEntrysConfig_default;
-  	printGodownEntryInfo_local(godownEntrysInfo, printType);
-}
-function printGodownEntryInfo_local(godownEntrysInfo, type){
-	setGoodsInfos(godownEntrysInfo);
-	godownEntrysInfo.category = '共'+godownEntrysInfo.totalRows+'种';
-	printGodownEntryInfo(godownEntrysInfo, type);
-}
+//function printGodownEntrys(godownEntrysInfo, printType) {
+//	godownEntrysInfo.applicationType = "一次性物品入库单";
+////	godownEntrysInfo.barcode = godownEntrysInfo.departBarcode;
+//	godownEntrysInfo.formTypeOfPrinted = 'godownEntry';
+//	var unitName = "";
+////  DWREngine.setAsync(false);
+////  SupplyRoomConfigTableManager.getStartTimeObject(function(config){
+////      if(config != null){
+////      	unitName = config.unitName;
+////      }
+////  });
+////  DWREngine.setAsync(true);
+//	godownEntrysInfo.unitName = unitName;
+////  godownEntrysInfo.printConfigObj_default = batchPrintGodownEntrysConfig_default;
+//  	printGodownEntryInfo_local(godownEntrysInfo, printType);
+//}
+//function printGodownEntryInfo_local(godownEntrysInfo, type){
+//	setGoodsInfos(godownEntrysInfo);
+//	godownEntrysInfo.category = '共'+godownEntrysInfo.totalRows+'种';
+//	printGodownEntryInfo(godownEntrysInfo, type);
+//}
 
 // 删除
 function deleteGodownEntry(grid) {
@@ -1443,6 +1443,7 @@
 
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	commonEntry.setCurrentUserName(curUserName);
 	var columns = [
 		{header : "单号",width : 200,dataIndex : 'serialNumber', renderer : modifyRecord},
 		{header : "操作员",width : 200,dataIndex : 'operator'},
@@ -1502,29 +1503,30 @@
 //		hidden : SSTS_WarehouseEntry_Delete,
 		iconCls : 'icon_print',
 		handler : function() {
-			  var records = grid.getSelectionModel().getSelections();
-			  if (records.length == 0) {
-			      showResult("请选择要打印的入库单！");
-			      return;
-			  }
-			  if (records.length != 1) {
-			      showResult("一次只能打印1个入库单！");
-			      return;
-			  }
-			  var ids = null;
-			  for ( var i = 0, len = records.length; i < len; i++) {
-			      if (ids == null) {
-			          ids = records[i].data['id'];
-			  } else {
-			      ids = ids + ',' + records[i].data['id'];
-			      }
-			  }
-			  top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗？",
-				function(btn) {
-					if (btn == 'yes') {
-						batchPrintGodownEntrys(ids,0);
-					}
-				});
+			commonEntry.onPrintEntryDetail(grid,entityName);
+//			  var records = grid.getSelectionModel().getSelections();
+//			  if (records.length == 0) {
+//			      showResult("请选择要打印的入库单！");
+//			      return;
+//			  }
+//			  if (records.length != 1) {
+//			      showResult("一次只能打印1个入库单！");
+//			      return;
+//			  }
+//			  var ids = null;
+//			  for ( var i = 0, len = records.length; i < len; i++) {
+//			      if (ids == null) {
+//			          ids = records[i].data['id'];
+//			  } else {
+//			      ids = ids + ',' + records[i].data['id'];
+//			      }
+//			  }
+//			  top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗？",
+//				function(btn) {
+//					if (btn == 'yes') {
+//						batchPrintGodownEntrys(ids,0);
+//					}
+//				});
 		}
 	},'-',{
 
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
===================================================================
diff -u -r12797 -r12959
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp	(.../godownOutView.jsp)	(revision 12797)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp	(.../godownOutView.jsp)	(revision 12959)
@@ -11,6 +11,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>退库单信息</title>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
@@ -26,11 +27,13 @@
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
 
 <script type="text/javascript">
 var TYPE_OUT = '<%=GodownEntry.TYPE_OUT%>';
 </script>
 <script type="text/javascript">
+	var curUserName = '${userName}';
     var SSTS_WarehouseEntry_Create = true;
     <operation:authorize ifAnyGranted="SSTS_WarehouseEntry_Create">
     SSTS_WarehouseEntry_Create = false;
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
===================================================================
diff -u -r12787 -r12959
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 12787)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 12959)
@@ -7,6 +7,10 @@
 	 */
 	var entryid = '';
 	/**
+	 * 当前用户
+	 */
+	var userName = '';
+	/**
 	 * 是否是新添加一张单
 	 * @returns {Boolean} true表示是打开一张单，false表示是新添加一张单
 	 */
@@ -19,4 +23,84 @@
 	this.setId = function(id){
 		entryid = id;
 	}
+	this.setCurrentUserName = function(name){
+		userName = name;
+	}
+	this.onPrintEntryDetail = function(grid,type){
+		  var records = grid.getSelectionModel().getSelections();
+		  if (records.length == 0) {
+		      showResult("请选择要打印的" + type + "！");
+		      return;
+		  }
+		  if (records.length != 1) {
+		      showResult("一次只能打印1个" + type + "！");
+		      return;
+		  }
+		  var ids = null;
+		  for ( var i = 0, len = records.length; i < len; i++) {
+		      if (ids == null) {
+		          ids = records[i].data['id'];
+		  } else {
+		      ids = ids + ',' + records[i].data['id'];
+		      }
+		  }
+		  top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗？",
+			function(btn) {
+				if (btn == 'yes') {
+					batchPrintGodownEntrys(ids,0,type);
+				}
+			});
+	
+	}
+	// 打印，目前只支持单个打印
+	function batchPrintGodownEntrys(ids, printType,entryType){
+		  if(ids == null)
+		       return;
+		  top.Ext.MessageBox.show({
+		      title:'请等待',
+		      msg:'打印中……',
+		      width:350,
+		      progress:true,
+		      closable:false
+		  });
+		  Ext.Ajax.timeout=300*000;
+		  Ext.Ajax.request({
+			  timeout: 300*000,
+		      url : WWWROOT + '/disinfectSystem/godownEntryAction!mergeLoadToussePrintData.do',
+		      params : {ids : ids},
+		      success : function(response){
+		    	  var result = Ext.decode(response.responseText);
+		    		result.printUser = userName;
+		    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
+		    		// 发料人默认改为当前用户
+		    		if (isUndefinedOrNullOrEmpty(result.sender)) {
+		    			result.sender = userName;
+		    		}
+		    		printGodownEntrys(result, printType,entryType);
+		    	  
+		          hideMessageBox(true);
+		      },
+		      failure: function(response){
+		          showResult("打印失败！");
+		          hideMessageBox(true);
+		      }
+		  });
+	}
+	function printGodownEntrys(godownEntrysInfo, printType,entryType) {
+		if(entryType == '退库单'){
+			godownEntrysInfo.applicationType = "一次性物品退库单";
+			godownEntrysInfo.formTypeOfPrinted = 'godownOutEntry';
+		}else{
+			godownEntrysInfo.applicationType = "一次性物品入库单";
+			godownEntrysInfo.formTypeOfPrinted = 'godownEntry';
+		}
+		var unitName = "";
+		godownEntrysInfo.unitName = unitName;
+	  	printGodownEntryInfo_local(godownEntrysInfo, printType);
+	}
+	function printGodownEntryInfo_local(godownEntrysInfo, type){
+		setGoodsInfos(godownEntrysInfo);
+		godownEntrysInfo.category = '共'+godownEntrysInfo.totalRows+'种';
+		printGodownEntryInfo(godownEntrysInfo, type);
+	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r12952 -r12959
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12952)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12959)
@@ -1,4 +1,4 @@
-var entityName = "退库单管理";
+var entityName = "退库单";
 var grid;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
 var commonEntry = new commonEntry();
@@ -654,7 +654,7 @@
 	var window = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
-		title : '退库单信息',
+		title : entityName + '信息',
 		width : 910,
 		height :500,
 		modal : true,
@@ -687,7 +687,7 @@
 	var records = grid.getSelectionModel().getSelections();
 
 	if (records.length == 0) {
-		showResult("请选择要删除的退库单！");
+		showResult("请选择要删除的" + entityName + "！");
 		return false;
 	}
 	var ids = null;
@@ -698,7 +698,7 @@
 			ids = ids + ';' + records[i].data['id'];
 		}
 	}
-	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的退库单信息？",
+	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的" + entityName + "信息？",
 		function(button, text) {
 			if ("yes" == button){
 				Ext.Ajax.request({
@@ -723,11 +723,11 @@
 var loadFormData = function(grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择要修改的退库单！");
+		showResult("请选择要修改的" + entityName + "！");
 		return false;
 	}
 	if (records.length > 1) {
-		showResult("一次只能修改一个退库单！");
+		showResult("一次只能修改一个" + entityName + "！");
 		return false;
 	}
 	id = records[0].data['id'];
@@ -797,6 +797,7 @@
 
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	commonEntry.setCurrentUserName(curUserName);
 	//单价数据源
 	if(priceStore == null){
 		priceStore = new Ext.data.Store({
@@ -865,13 +866,20 @@
 		handler : function() {
 			loadFormData(grid);
 		}
+	},'-',{
+		text : '打印',
+//		hidden : SSTS_WarehouseEntry_Delete,
+		iconCls : 'icon_print',
+		handler : function(){
+			commonEntry.onPrintEntryDetail(grid,entityName)
+		}
 	}];
 
 	grid = new Ext.ux.ForgonPageGrid( {
 		tbar : tbar,
 		pageSize : 20,
 		defaultSortField : 'id',
-		title : '退库单列表',
+		title :  entityName + '列表',
 		defaultSortDirection : 'ASC',
 		isCheckboxSelectionModel : false,
 		rememberSelected : false,