Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageView.js
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageView.js	(.../storageLocationManageView.js)	(revision 26725)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageView.js	(.../storageLocationManageView.js)	(revision 26799)
@@ -133,16 +133,18 @@
 }
 
 
-function print_storageLocation(barcode,name,unitName,printType) {
+function print_storageLocation(barcode,name,unitName,printType,storageLocationCode,simpleName) {
 	var obj = {
 			barcode:barcode,
 			name:name,
 			unitName:unitName,
+			storageLocationCode:storageLocationCode,
+			simpleName:simpleName,
 			defaultPrintFun: function(){
 				if(printType == PRINT_TYPE_PREVIEW){
-					preview(barcode,name,unitName);
+					storageLocationPreview(barcode,name,unitName,storageLocationCode,simpleName);
 				}else{
-					defaultPrint(barcode,name,unitName);
+					storageLocationDefaultPrint(barcode,name,unitName,storageLocationCode,simpleName);
 				}
 			},
 			dataSourceName: '库位',
@@ -167,6 +169,10 @@
     },{
     	name : 'parentId'
     },{
+    	name : 'simpleName'
+    },{
+    	name : 'storageLocationCode'
+    },{
     	name : 'name'
     },{
     	name : 'barcode'
@@ -215,6 +221,9 @@
  	   			for(var i=0;i<recs.length;i++){
  	   				var name  = recs[i].get("name");
  	   				var barcode = recs[i].get("barcode");
+					var storageLocationCode = recs[i].get("storageLocationCode");
+					var simpleName = recs[i].get("simpleName");
+					
  	   				var unitName2 = "";
  	   				DWREngine.setAsync(false);
  	   			 	SupplyRoomConfigTableManager.getUnitName(function(unitName){
@@ -223,7 +232,7 @@
  	   					}
  	   				});
  	   				DWREngine.setAsync(true);
- 	   				print_storageLocation(barcode,name,unitName2);
+ 	   				print_storageLocation(barcode,name,unitName2,"",storageLocationCode,simpleName);
  	   			}
  	   		}else{
  	   			MsgTip.msg('提示','未选择打印的内容！',true,3);
@@ -236,6 +245,7 @@
 		{dataIndex : 'orgUnitCode',hidden:true},
 		{dataIndex : 'parentId',hidden:true}, */
 		{header : "库位名称",width : 150,dataIndex : 'name',renderer : modifyRecord},
+		{header : "库位编码",width : 130,dataIndex : 'storageLocationCode'},
 		{header : "条码",width : 150,dataIndex : 'barcode'},
 		{header : "仓库",width : 150,dataIndex : 'wareHouseName'},
 		{header : "所属科室名称",width : 100,dataIndex : 'orgUnitName'},
@@ -246,6 +256,8 @@
 		filters : [{
 			type : 'string', dataIndex : 'name'
 	    },{
+			type : 'string', dataIndex : 'storageLocationCode'
+	    },{
 			type : 'string', dataIndex : 'barcode'
 	    },{
 			type : 'string', dataIndex : 'wareHouseName'
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 26725)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 26799)
@@ -49,7 +49,7 @@
 		<portalItem type="1" system="1" title="培训管理" itemId="training" operationIds="SSTS_TrainingManage_Add,SSTS_TrainingManage_Update,SSTS_TrainingManage_Delete" imgUrl="/themes/portalPage/img/training.png" itemLinkUrl="/knowledge/view.do?moduleId=trainingManage" />
 		<portalItem type="1" system="1" title="仪器图谱" itemId="toussePictures" operationIds="SSTS_Tousse_Pictures" imgUrl="/themes/portalPage/img/toussePictures.png" itemLinkUrl="/disinfectsystem/toussePictures/toussePictures.jsp" />
 		<portalItem type="1" system="1" title="基数管理" itemId="cardinalNumManage" operationIds="SSTS_DepartMentTousseManager" imgUrl="/themes/portalPage/img/CardinalNumber.png" itemLinkUrl="/disinfectsystem/departmentStock/departmentStockInputView.jsp" />
-		<portalItem type="1" system="1" title="库位管理" itemId="storageLocationManager" operationIds="SSTS_storageLocation_Create,SSTS_storageLocation_Update,SSTS_storageLocation_Delete" imgUrl="/themes/portalPage/img/drawer.png" itemLinkUrl="/disinfectsystem/storageLocationManage/storageLocationManageView.jsp" />
+		<portalItem type="1" system="1" title="库存查看" itemId="storageLocationManagerLook" operationIds="SSTS_storageLocationLook_Manager" imgUrl="/themes/portalPage/img/drawer.png" itemLinkUrl="/disinfectsystem/storageLocationManage/storageLocationLookView.jsp" />
 		<portalItem type="1" system="1" title="高级视图" itemId="enterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/homepage/portal.jsp" />
 
 		<portalItem type="1" system="2" title="高级视图" itemId="expensiveEnterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/expensivegoodshomepage/portal.jsp" />
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
===================================================================
diff -u -r26727 -r26799
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 26727)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 26799)
@@ -100,11 +100,11 @@
     	name : 'validUntil'
     },{
     	name : 'tousseBarcode'
-    }/* ,{
-    	name : 'barcode'
-    } */,{
+    },{
     	name : 'storageLocationName'
     },{
+    	name : 'storageLocationCode'
+    },{
     	name : 'parentStorageLocationPath'
     },{
     	name : 'wareHouseName'
@@ -116,9 +116,9 @@
     	header	: "物品名称",width : 200,dataIndex : 'tousseName'},		
 		{header : "灭菌日期",width :150,dataIndex : 'sterileEndTime' },
 		{header : "失效日期",width : 150,dataIndex : 'validUntil'},
-		{header : "器械包条码",width : 120,dataIndex : 'tousseBarcode'},
-		/* {header : "库位条码",width : 120,dataIndex : 'barcode'}, */
+		{header : "器械包条码",width : 120,dataIndex : 'tousseBarcode'},		
 		{header : "抽屉名称",width : 100,dataIndex : 'storageLocationName'},
+		{header : "库位编码",width : 120,dataIndex : 'storageLocationCode'},
 		{header : "上级库位",width : 200,dataIndex : 'parentStorageLocationPath',menuDisabled : true},
 		{header : "仓库",width : 120,dataIndex : 'wareHouseName'},
 		{header : "所属科室",width : 120,dataIndex : 'orgUnitName',id:"orgUnitName"}
@@ -129,9 +129,9 @@
 			{type : 'string', dataIndex : 'tousseName'},
 			{type : 'date', dataIndex : 'sterileEndTime'},			
 			{type : 'date', dataIndex : 'validUntil'},
-			{type : 'string', dataIndex : 'tousseBarcode'},
-			/* {type : 'string', dataIndex : 'barcode'}, */
+			{type : 'string', dataIndex : 'tousseBarcode'},		
 			{type : 'string', dataIndex : 'storageLocationName'},
+			{type : 'string', dataIndex : 'storageLocationCode'}, 
 			{type : 'string', dataIndex : 'parentStorageLocationPath'},
 			{type : 'string', dataIndex : 'wareHouseName'},
 			{type : 'string', dataIndex : 'orgUnitName'}
@@ -221,6 +221,7 @@
 						specialkey : function(field, e) {
 							var key = e.getKey();
 							if (key == Ext.EventObject.ENTER) {
+								queryStorageLocation();
 								Ext.getCmp('warseHouseName').focus();
 							}
 						}
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26725)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26799)
@@ -1182,6 +1182,57 @@
 		obj.defaultPrintFun();
 	}
 }
+function CreateStorageLocation(barcode,name,unitName,storageLocationCode,simpleName) {
+	doGetLodop();
+	var tableHtml ="<table border ='0' style=\"width: 50mm; height: 30mm\">";
+	tableHtml += "<tr height='5mm'>";
+	tableHtml += "<td colspan='4' style='font-size: 14px;'><center>"+unitName+"</center>";
+	tableHtml += "</td>";
+	tableHtml += "</tr>";
+	
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='2' style='font-size: 16px;' align='center'>"+name+"</td>";
+	tableHtml += "</tr>";
+	
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='2' style='font-size: 16px;' align='center'>"+storageLocationCode+"</td>";
+	tableHtml += "</tr>";
+	
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='2' style='font-size: 10px;'><center>";
+	tableHtml += "<img src='" + getPrintBarcodeURL({barcode:barcode}) + "'/>";
+	tableHtml += "</br>"+barcode;
+	tableHtml += "</center></td></tr>";
+	
+	tableHtml += "</table>";
+	LODOP.ADD_PRINT_HTM(0,0,"100%","100%","<body leftmargin=0 topmargin=0>"+tableHtml+"</body>");
+	LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
+	
+};
+
+function storageLocationDefaultPrint(barcode,name,unitName,storageLocationCode,simpleName) {
+	if (barcode != null && barcode != '') {
+		doGetLodop();
+		LODOP.PRINT_INIT("");
+		LODOP.SET_PRINTER_INDEX(-1);// TODO 可增加切换打印机的处理
+		CreateStorageLocation(barcode,name,unitName,storageLocationCode,simpleName);
+		LODOP.PRINT();
+	} else {
+		alert("打印内容为空");
+	}
+}
+//库位打印预览
+function storageLocationPreview(barcode,name,unitName,storageLocationCode,simpleName) {
+	if (barcode != null && barcode != '') {
+		doGetLodop();
+		LODOP.PRINT_INIT("");
+		CreateStorageLocation(barcode,name,unitName,storageLocationCode,simpleName);
+		LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
+		LODOP.PREVIEW();
+	} else {
+		alert("打印内容为空");
+	}
+};
 //库位打印
 function printObjStorageLocation(obj){
 	var t = getTemplateByDatasourceAndStyle(obj.dataSourceName, obj.styleName);
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26725)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26799)
@@ -841,7 +841,7 @@
 		}
 		
 		//如果没有开启库位管理功能,则桌面图标不显示
-		if(!sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManager'){
+		if(!sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManagerLook'){
 			return returnContent;
 		}
 		
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageForm.js
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageForm.js	(.../storageLocationManageForm.js)	(revision 26725)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationManageForm.js	(.../storageLocationManageForm.js)	(revision 26799)
@@ -245,6 +245,18 @@
 					anchor : '95%'
 				}]
 	        },{
+				columnWidth : .5,
+				layout : 'form',
+				labelAlign:"right",
+				height:30,
+				items:[{
+					xtype : 'textfield',
+					name : 'storageLocationSimpleName',
+					id : 'storageLocationSimpleName',
+					fieldLabel : '库位简称',
+					anchor : '95%'
+				}]
+			},{
 				columnWidth : 0.85,
 				layout : 'form',
                 labelAlign:"right",
@@ -366,6 +378,9 @@
 				top.Ext.getCmp('wareHouseBelong').setValue(data.wareHouseName);
 				top.Ext.getCmp('putInGoods').setValue(data.tousseDefinitionNames);
 				top.Ext.getCmp('putInGoodsCode').setValue(data.tousseDefinitionIds);
+				top.Ext.getCmp('wareHouseCode').setValue(data.storageLocationCode);
+				top.Ext.getCmp('storageLocationSimpleName').setValue(data.simpleName);
+				//top.Ext.getCmp('storageLocationSimpleName').setValue(data.storageLocationSimpleName);
 				if (data.parentId == 0) {
 					wareHouseId = data.wareHouseId;
 					types = "storage";
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r26725 -r26799
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26725)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26799)
@@ -699,12 +699,20 @@
 		textForPreview: '010000110'
 	}),new ObjectDataSourceProperty({
 		propName: 'name',
-		displayName: '名字',
+		displayName: '库位名称',
 		textForPreview: '抽屉01'
 	}),new ObjectDataSourceProperty({
 		propName: 'unitName',
 		displayName: '单位名称',
 		textForPreview: '妇幼医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'storageLocationCode',
+		displayName: '库位编码',
+		textForPreview: '011'
+	}),new ObjectDataSourceProperty({
+		propName: 'simpleName',
+		displayName: '库位简称',
+		textForPreview: '1号仓库'
 	})]
 });
 objectDataSourceManager.registerDataSource(storageLocationDataSource);