Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r20817 -r20823
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 20817)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 20823)
@@ -1081,11 +1081,24 @@
  * 《高值耗材管理》菜单
  */
 var SSTS_ExpensiveGoods_Menu = true;
-<operation:authorize ifAnyGranted="SSTS_ExpensiveGoods_Create,SSTS_ExpensiveGoods_Update,SSTS_ExpensiveGoods_Select,SSTS_ExpensiveGoods_Delete">
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoods_Create,SSTS_ExpensiveGoods_Update,SSTS_ExpensiveGoods_Select,SSTS_ExpensiveGoods_Delete,SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager,SSTS_ExpensiveGoodsPrepareGodownEntry_Manager">
 	if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) {
 		SSTS_ExpensiveGoods_Menu = false;
 	}
 </operation:authorize>
+
+//高值耗材自购入库管理
+var SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager">
+SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = false;
+</operation:authorize>
+
+//高值耗材预入库管理
+var SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = true;
+var SSTS_WarehouseEntryOut_Menu = true;
+SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = false;
+</operation:authorize>
+
 /* 高值耗材 */
 
 /**
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r20817 -r20823
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 20817)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 20823)
@@ -323,11 +323,11 @@
         {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Menu && SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager,text:"高值耗材自购入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Menu && SSTS_ExpensiveGoodsPrepareGodownEntry_Manager,text:"高值耗材预入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_DisposableGoodsProfitAndLoss_Manager,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_DisposableGoodsCheck_Manager,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/'+ (sstsConfig.inventoryDisposableVersion == 2 ? "inventoryrecordView2.jsp" : "inventoryrecordView.jsp") +'?type=expensiveGoods',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r20817 -r20823
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 20817)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 20823)
@@ -216,6 +216,16 @@
 	   <operation operationId="SSTS_ExpensiveGoods_Update" operationName="��ֵ�IJ��޸�"></operation>
 	   <operation operationId="SSTS_ExpensiveGoods_Select" operationName="��ֵ�IJIJ�ѯ"></operation>
 	   <operation operationId="SSTS_ExpensiveGoods_Delete" operationName="��ֵ�IJ�ɾ��"></operation>
+
+	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager" operationName="��ֵ�IJ��Թ�������"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Create" operationName="��ֵ�IJ��Թ�������"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Update" operationName="��ֵ�IJ��Թ�����޸�"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Delete" operationName="��ֵ�IJ��Թ����ɾ��"></operation>
+
+	   <operation operationId="SSTS_ExpensiveGoodsPrepareGodownEntry_Manager" operationName="��ֵ�IJ�Ԥ������"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPrepareGodownEntry_Create" operationName="��ֵ�IJ�Ԥ������"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPrepareGodownEntry_Update" operationName="��ֵ�IJ�Ԥ����޸�"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsPrepareGodownEntry_Delete" operationName="��ֵ�IJ�Ԥ���ɾ��"></operation>
     </modelName>
     
     <modelName modleName="һ������Ʒ�ֿ����ģ��">