From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 26 Jan 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/WEB-INF/spring-menu.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/WEB-INF/spring-menu.xml b/src/main/webapp/WEB-INF/spring-menu.xml
index 98f0b38..186064f 100644
--- a/src/main/webapp/WEB-INF/spring-menu.xml
+++ b/src/main/webapp/WEB-INF/spring-menu.xml
@@ -153,6 +153,15 @@
</bean>
<bean class="com.nanometer.smartlab.model.MenuModel">
+ <property name="id" value="order_input_warehouse"></property>
+ <property name="title" value="仓库订单领用"></property>
+ <property name="page" value="order_input_warehouse"></property>
+ <property name="dispInMenuList" value="false"></property>
+ <property name="initClazz" value="warehouseStockMngController"></property>
+ <property name="initMethod" value="initInputWarehouse"></property>
+ </bean>
+
+ <bean class="com.nanometer.smartlab.model.MenuModel">
<property name="id" value="warehouse_reagent_direct_store"></property>
<property name="title" value="试剂直接入库"></property>
<property name="page" value="warehouse_reagent_direct_store"></property>
@@ -211,6 +220,24 @@
<property name="page" value="sys_controller_mng"></property>
<property name="privilegeCode" value="sys_controller_mng"></property>
</bean>
+ <bean class="com.nanometer.smartlab.model.MenuModel">
+ <property name="id" value="sys_dangerous_encode"></property>
+ <property name="title" value="危化品编码"></property>
+ <property name="page" value="sys_dangerous_encode"></property>
+ <property name="privilegeCode" value="sys_dangerous_encode"></property>
+ </bean>
+ <bean class="com.nanometer.smartlab.model.MenuModel">
+ <property name="id" value="sys_encode_replace_dict"></property>
+ <property name="title" value="编码替换字典"></property>
+ <property name="page" value="sys_encode_replace_dict"></property>
+ <property name="privilegeCode" value="sys_encode_replace_dict"></property>
+ </bean>
+ <bean class="com.nanometer.smartlab.model.MenuModel">
+ <property name="id" value="sys_hazardous_waste"></property>
+ <property name="title" value="危废处理信息"></property>
+ <property name="page" value="sys_hazardous_waste"></property>
+ <property name="privilegeCode" value="sys_hazardous_waste"></property>
+ </bean>
</list>
</property>
</bean>
--
Gitblit v1.9.2