Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r35075 -r35526
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 35075)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 35526)
@@ -319,6 +319,12 @@
   enableExportFilesOfTrainingModule:true,
   //回收界面是否显示选择模板的下拉框
   isOpenLoadTemplateByUnitInRecyclingModule:true,
+  //是否启用手术仪器管理，默认为不启用
+  enableSurgicalInstrumentsManagement:true,
+  //启用库位管理模块
+  enableWarehousePositionModule:true,
+  //启用手术仪器管理和库位管理联动功能
+  enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction:true,
   //发货计划背景颜色设定
   backgroudColorConfigOfInvoiceGoodsList : {
 	unsterilizedColor : { "className" : "my_row_white" , "color" : "#ffffff"},//未灭菌的颜色
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
===================================================================
diff -u -r35516 -r35526
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 35516)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 35526)
@@ -102,7 +102,6 @@
 
 //验证器械包预警期、失效期
 function getValidAndWarningStatus(record,p){
-	console.log(serverDate)
 	var validUntil = record.data.validUntil;
 	var warningUntil = record.data.warningUntil;
 
@@ -149,6 +148,11 @@
     //所有grid之外的参数用这个方法传入,返回的是Map<String, List<String>>
     Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function(){};
 
+	var enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction = false;
+	if(sstsConfig.enableSurgicalInstrumentsManagement && sstsConfig.enableWarehousePositionModule){
+		enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction = sstsConfig.enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction;
+	}
+
     var readerDetail = [{
     	name : 'tousseName'
     },{
@@ -160,6 +164,12 @@
     },{
     	name : 'tousseBarcode'
     },{
+    	name : 'storageStatus'
+    },{
+    	name : 'depart2'
+    },{
+    	name : 'location2'
+    },{
     	name : 'storageLocationName'
     },{
     	name : 'storageLocationCode'
@@ -176,6 +186,9 @@
 		{header : "灭菌日期",width :150,dataIndex : 'sterileEndTime' },
 		{header : "失效日期",width : 150,dataIndex : 'validUntil',renderer : checkDate},
 		{header : "器械包条码",width : 120,dataIndex : 'tousseBarcode'},		
+		{header : "库位状态",width : 80,dataIndex : 'storageStatus',hidden:!enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction},
+		{header : "目的科室",width : 80,dataIndex : 'depart2',hidden:!enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction},
+		{header : "目的位置",width : 80,dataIndex : 'location2',hidden:!enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction},
 		{header : "抽屉名称",width : 100,dataIndex : 'storageLocationName'},
 		{header : "库位编码",width : 120,dataIndex : 'storageLocationCode'},
 		{header : "上级库位",width : 200,dataIndex : 'parentStorageLocationPath',menuDisabled : true},
@@ -189,6 +202,9 @@
 			{type : 'date', dataIndex : 'sterileEndTime'},			
 			{type : 'date', dataIndex : 'validUntil'},
 			{type : 'string', dataIndex : 'tousseBarcode'},		
+			{type : 'string', dataIndex : 'storageStatus'},	
+			{type : 'string', dataIndex : 'depart2'},	
+			{type : 'string', dataIndex : 'location2'},	
 			{type : 'string', dataIndex : 'storageLocationName'},
 			{type : 'string', dataIndex : 'storageLocationCode'}, 
 			{type : 'string', dataIndex : 'parentStorageLocationPath'},
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp
===================================================================
diff -u -r29513 -r35526
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp	(.../storageLocationLookView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp	(.../storageLocationLookView.jsp)	(revision 35526)
@@ -4,6 +4,7 @@
 <html>
 <head>
 	<title>库存查看</title>
+	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>