Index: ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r40661
--- ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 40661)
@@ -333,7 +333,7 @@
         {hidden :disableLoadToVirtualBasket || SSTS_VIRTUAL_BASKET_MONITOR,text:"虚拟篮筐监控",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/basketMonitor/virtualBasketMonitor.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
     ]
 }
-/*,{
+,{
 	text:"一次性物品管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_DisposableGoods_Manager,
@@ -351,7 +351,7 @@
         {hidden :SSTS_DisposableGoodsCheck_Manager,text:"一次性物品盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/'+ (sstsConfig.inventoryDisposableVersion == 2 ? "inventoryrecordView2.jsp" : "inventoryrecordView.jsp") +'?type=' + inventoryTypeCodeDisposableGoods,hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodSsettleAccounts_Manager,text:"一次性物品结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-}*/
+}
 ,{
 	text:"高值耗材管理",
 	singleClickExpand:singleClickExpandTree,
@@ -375,7 +375,8 @@
     	{hidden :SSTS_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:encodeURI(WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单'),hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Hidden_Manager,text:"我的已办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-},{
+},
+/*{
 	text:"采购计划",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_PurchasePlan_Manager,
@@ -393,7 +394,8 @@
         {hidden :SSTS_Contract_Manager,text:"药品合同管理",href:encodeURI(WWWROOT+'/disinfectsystem/assestManagement/contract/contractView.jsp?contractType='+ contactTypeMedicine),hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Contract_Manager,text:"其他合同管理",href:encodeURI(WWWROOT+'/disinfectsystem/assestManagement/contract/contractView.jsp?contractType='+ contactTypeOther),hrefTarget:linkTarget,leaf:true}
     ]
-},{
+},*/
+{
 	text:"器械仓库管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_MaterialStock_Manager,
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/print/printConfig.js
===================================================================
diff -u -r32744 -r40661
--- ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/print/printConfig.js	(.../printConfig.js)	(revision 32744)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/print/printConfig.js	(.../printConfig.js)	(revision 40661)
@@ -1,7 +1,7 @@
 var appropriationInListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]},
+	    	            {label : "南方医科大学口腔医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]},
 	    	            {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]},
 	    	            {label : "仓库：", dataIndex : 'warehouse', fontSize : 9, position : ["1cm","2%","90%",5]}
 	    	        ],
@@ -28,7 +28,7 @@
 var appropriationOutListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院调拨出库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]},
+	    	            {label : "南方医科大学口腔医院调拨出库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]},
 	    	            {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]},
 	    	            {label : "仓库：", dataIndex : 'warehouse', fontSize : 9, position : ["1cm","2%","90%",5]}
 	    	        ],
@@ -55,7 +55,7 @@
 var appropriationListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院调拨单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
+	    	            {label : "南方医科大学口腔医院调拨单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
 	    	            {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}
 	    	            //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]}
 	    	        ],
@@ -82,7 +82,7 @@
 var godownEntryOutListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院退库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
+	    	            {label : "南方医科大学口腔医院退库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
 	    	            {label : "退库日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}
 	    	            //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]}
 	    	        ],
@@ -107,7 +107,7 @@
 var godownStockTakeListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院盘盈盘亏单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
+	    	            {label : "南方医科大学口腔医院盘盈盘亏单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
 	    	            {label : "日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}
 	    	            //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]}
 	    	        ],
@@ -132,7 +132,7 @@
 var godownEntryListPrintConfig = {
 		headerFooter : [
 	    	            // 页眉名称
-	    	            {label : "广东省口腔医院入库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
+	    	            {label : "南方医科大学口腔医院入库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]},
 	    	            {label : "入库日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}
 	    	            //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]}
 	    	        ],
@@ -169,7 +169,7 @@
     rowsPerPage : 9,
         headerContent : [
             // 页眉名称
-            {label : "广东省口腔医院", dataIndex : '', fontSize : 12, position : ["5","1%","90%",5]},
+            {label : "南方医科大学口腔医院", dataIndex : '', fontSize : 12, position : ["5","1%","90%",5]},
             // 标题
             {label : "无菌物品出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
             {label : "部门：", dataIndex : 'depart', fontSize : 12, position : ["55","2%","90%",5]},
@@ -214,9 +214,9 @@
 var batchPrintMaterialInvoicesConfig = {
         headerFooter : [
     	            // 页眉名称
-    	            //{label : "广东省口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
+    	            //{label : "南方医科大学口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
     	            // 标题
-    	            {label : "广东省口腔医院卫生材料出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]},
+    	            {label : "南方医科大学口腔医院卫生材料出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]},
     	            {label : "科室：", dataIndex : 'depart', fontSize : 11, position : ["30","2%","90%",5]},
     	            {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["30","25%","90%",5]},
     	            {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","58%","90%",5]},
@@ -232,7 +232,7 @@
     	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["30","50%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 20,
-    	        	position : ["50","1%","99%","6.0cm"],
+    	        	position : ["50","1%","99%","27.9cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '100', align : 'center', fontSize : 11},
@@ -253,7 +253,7 @@
 var batchPrintInvoicesConfig = {
         headerFooter : [
     	            // 页眉名称
-    	            {label : "广东省口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
+    	            {label : "南方医科大学口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
     	            // 标题
     	            {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
     	            {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
@@ -277,7 +277,7 @@
     	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["11cm","81%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 25,
-    	        	position : ["100","1%","97%","6.5cm"],
+    	        	position : ["100","1%","97%","27.9cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '10%', align : 'center', fontSize : 11},
@@ -297,7 +297,7 @@
 var invoiceComboPrintConfig = {
 	        headerFooter : [
 	            // 页眉名称
-	            {label : "广东省口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
+	            {label : "南方医科大学口腔医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
 	            // 标题
 	            {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
 	            {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
@@ -323,7 +323,7 @@
 	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["445","81%","90%",5]},
 	        goodsTable :{
 	        	rowHeight : 25,
-	        	position : ["100","1%","97%","7cm"],
+	        	position : ["100","1%","97%","27.9cm"],
 	        	headRepeat : true,
 	        	columns : [
 	                {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js
===================================================================
diff -u -r40658 -r40661
--- ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js	(.../config.js)	(revision 40658)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js	(.../config.js)	(revision 40661)
@@ -10,10 +10,16 @@
   //在界面上是否隐藏一次性物品的包装规格信息
   hidePackageSpec : false,
   // 申请界面是否显示器械包或消毒物品的的单位
-  showTousseUnitColumn : true,		
+  showTousseUnitColumn : true,
+  //开启显示待发货物品的来源信息功能
+  enableShowToSendGoodsSourcesInfo:true,
+  //是否启用灭菌交接功能
+  enableSterilizationTransition:false,
   // 条码类型：1：一维码， 2：二维码
  //barcodeType : 2,
  barcodeCodeType:"QRCode",
+  //回收人默认用登录用户
+  recyclingUserDefault:true,
   //是否启用回收清点左边键盘按钮 (false不启用，true启用 默认false)
   enbaleRecoveryCheckLeftKeyboard: true,
   // 申请器械包时是否自动归还待归还物品
@@ -65,7 +71,7 @@
   //发货科室依据，设置为结算科室
   invoice_groupBy:"settleAccountsDepartCoding",
   //回收界面回收人是否强制不能为空
-  recyclePageRecyclingUserNotNull : true,
+  //recyclePageRecyclingUserNotNull :false,
   //回收一键入筐
   recycleAllTousseIntoBasket : true,
   //退出回收模块后不记住回收界面的过滤条件
@@ -97,7 +103,7 @@
   //在灭菌视图界面是否显示“生物监测的状态”属性
   showBiologicalMonitoringStatus : true,
   //是否显示辅助发货按钮
-  showAuxiliaryInvoiceBtn : false,
+  showAuxiliaryInvoiceBtn : true,
   //公司名称 "dingxiang"显示主页显示丁香的logo
   companyName : "dingxiang",
   //是否显示包实例科室(待灭菌与待灭菌装载的表格)
@@ -160,5 +166,10 @@
   //启用装配后自动装载到篮筐
   enbaleLoadAutomaticallyIntoBasketsAfterAssembly:true,
   //是否允许部分回收
-  enablePartRecycle:true
+  enablePartRecycle:true,
+  //回收界面回收人是否默认是否为上一次回收的回收人,默认为false	
+  recyclePageRecyclingUserDefaultLastRecyclingUser:false,
+  //启用【器械包种类定义】功能
+  enableInstrumentSetTypeSetting:true
+  
 }
\ No newline at end of file