Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r25481 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 25481)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 26815)
@@ -1664,9 +1664,15 @@
 			var maker = tousse.maker;
 			var assistant = tousse.assistant;
 			var markTousse = tousse.tousse;
+			
+			var storageLocationCode = tousse.storageLocationCode;
+			var simpleName = tousse.simpleName;
+			var operationDate = tousse.operationDate;
+			var inspectorName = tousse.inspectorName;
+			
 			var printSummaryObj = {'barcode':barcode, 'name':name,'tousseNameWithoutDepart': name, 'applicant':applicant, 'depart': depart, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
 					'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':sterilingType,
-					'maker':maker,'assistant':assistant,'markTousse':markTousse};
+					'maker':maker,'assistant':assistant,'markTousse':markTousse,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName};
 			top.Ext4.applyIf(printSummaryObj,tousse);
 			
 			setMaterialsForPrint(printSummaryObj,barcode);
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r26799 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26799)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26815)
@@ -283,9 +283,20 @@
 		propName: 'idCardDefinitionDescription',
 		displayName: '标识牌定义描述',
 		textForPreview: '注意事项'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
+
 objectDataSourceManager.registerDataSource(normalTousseDataSource);
+
+
 //外来器械包
 var foreignTousseDataSource = new ObjectDataSource({
 	name: '外来器械包',
@@ -429,6 +440,14 @@
 		propName: 'remark',
 		displayName: '备注',
 		textForPreview: '测试备注'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignTousseDataSource);
@@ -495,6 +514,14 @@
 		propName: 'sterilisationAbbreviation',
 		displayName: '灭菌程序简称',
 		textForPreview: 'P'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignProxyDisinfectionTousseDataSource);
@@ -716,3 +743,23 @@
 	})]
 });
 objectDataSourceManager.registerDataSource(storageLocationDataSource);
+//开启库位管理，才显示库位编码、库位简称
+if(sstsConfig.enableWarehousePositionModule){
+	var storageLocationCodeObj = new ObjectDataSourceProperty({
+		propName: 'storageLocationCode',
+		displayName: '库位编码',
+		textForPreview: '0123'
+	});
+	normalTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	foreignTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	foreignProxyDisinfectionTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	var simpleNameObj = new ObjectDataSourceProperty({
+		propName: 'simpleName',
+		displayName: '库位简称',
+		textForPreview: '1号仓库'
+	});
+	normalTousseDataSource.objectProperties.push(simpleNameObj);
+	foreignTousseDataSource.objectProperties.push(simpleNameObj);
+	foreignProxyDisinfectionTousseDataSource.objectProperties.push(simpleNameObj);
+	
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp
===================================================================
diff -u -r15105 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp	(.../labelTemplateView.jsp)	(revision 15105)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp	(.../labelTemplateView.jsp)	(revision 26815)
@@ -18,6 +18,7 @@
 </head>
 <body>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/LabelTemplateTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
===================================================================
diff -u -r24682 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/print/print.jsp	(.../print.jsp)	(revision 24682)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.jsp	(.../print.jsp)	(revision 26815)
@@ -20,6 +20,7 @@
 	request.setAttribute("allTemplateInfoJsonStr",allTemplateInfoJsonStr);
 	request.setAttribute("allTemplateList",allTemplateList);
 %>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/dataSource.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/configObj.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/LabelTemplateTableManager.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r25421 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 25421)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 26815)
@@ -323,7 +323,12 @@
 	var operatorToPrint = tousseObj.operatorToPrint;
 	var reviewerToPrint = tousseObj.reviewerToPrint;
 	var sterilizationUserToPrint = tousseObj.sterilizationUserToPrint;
-    var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation;
+    var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation;	
+	
+	var storageLocationCode = tousseObj.storageLocationCode;
+	var simpleName = tousseObj.simpleName;
+	var operationDate = tousseObj.operationDate;
+	var inspectorName = tousseObj.inspectorName;
     //获取申请单需要打印的手术病人信息
     var foreignTousseAppInfo = {};
     if(tousseType == '外来器械包' || tousseType == '外来器械拆分小包'){
@@ -355,7 +360,8 @@
             				'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea,
             				'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment,
             				'packageTypeAbbreviation':packageTypeAbbreviation,'applicationItemTotal':foreignTousseAppInfo.applicationItemTotal,'operationRoom':foreignTousseAppInfo.operationRoom,
-            				'remark':foreignTousseAppInfo.remark
+            				'remark':foreignTousseAppInfo.remark,
+							'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName
             		};
             		printSummaryObj.washOperator = tousseObj.washOperator;
             		printSummaryObj.tousseType = tousseObj.tousseType;
@@ -382,7 +388,7 @@
             		}
             		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
             				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
-            				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
+            				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName};
             	
             		obj.washOperator = tousseObj.washOperator;
             		obj.tousseType = tousseObj.tousseType;
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
===================================================================
diff -u -r17770 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 17770)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 26815)
@@ -9,6 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <script type="text/javascript" src="${ctx}/js/json3.min.js" ></script>
 <script type="text/javascript" src="${ctx}/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
 <script language="javascript" src="dataSource.js"></script>