diff --git a/MainWindow.xaml b/MainWindow.xaml
index ba9a438..beb9eaf 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -24,8 +24,10 @@
                 <MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/>
                 <Separator/>
                 <MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
+                <MenuItem Header="_转换设置" FontSize="16" Name="_EXCHANGE_SET" IsEnabled="False"/> 
                 <MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/>
                 <MenuItem Header="_用户设置" FontSize="16" Name="_USER_SET" Click="USER_SET" IsEnabled="False"/>
+                <MenuItem Header="_登录限制" FontSize="16" Name="_USER_log" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_管理" FontSize="16" Focusable ="False">
                 <MenuItem Header="_染色机管理" FontSize="16" Name="_MAC_SET" Click="MAC_SET" IsEnabled="False"/>
@@ -35,7 +37,7 @@
                 <MenuItem Header="_预设工艺管理" FontSize="16" Name="_PROCESS" Click="PROCESS" IsEnabled="False"/>
                 <Separator/>
                 <MenuItem Header="_配送流程管理" FontSize="16" Name="_WORKFLOW" Click="WORKFLOW" IsEnabled="False"/>
-                <MenuItem Header="_流程选择设置" FontSize="16" Name="_WORKFLOWSET" Click="WORKFLOWSET" IsEnabled="False"/>
+                <MenuItem Header="_流程选择规则" FontSize="16" Name="_WORKFLOWSET" Click="WORKFLOWSET" IsEnabled="False"/>
                 <Separator />
                 <MenuItem Header="_布种" FontSize="16" Name="_fabric" Click="fabric" IsEnabled="False"/>
                 <MenuItem Header="_颜色名" FontSize="16" Name="_color" Click="color" IsEnabled="False"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index fbd36f2..51bd7d0 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -90,8 +90,10 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
+                _EXCHANGE_SET.IsEnabled = true;
                 _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
+                _USER_log.IsEnabled = true;
                 _RECIPE.IsEnabled = true;
                 _PROCESS.IsEnabled = true;
                 _WORKFLOW.IsEnabled = true;
@@ -142,7 +144,7 @@ namespace formula_manage
         {
             DataTable logindataTable = new DataTable();   //建立login缓存
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);
-            string user_sql = "SELECT UserCode ,PassWord ,UserSetup ,Capacity ,GROUP_CODE ,Note FROM [Dispensing].[dbo].[UserAccount] WHERE Capacity != 0";//查询语句            
+            string user_sql = "SELECT UserCode ,PassWord ,UserSetup ,Capacity ,GROUP_CODE ,Note FROM [dbo].[UserAccount] WHERE Capacity != 0";//查询语句            
 
             try
             {
@@ -168,6 +170,7 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
+                _EXCHANGE_SET.IsEnabled = true;
                 _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
                 _RECIPE.IsEnabled = true;
@@ -408,7 +411,7 @@ namespace formula_manage
         {
 
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);
-            string DYELOTS_sql = "SELECT count(*) FROM [Dispensing].[dbo].[DYELOTS_RECIPE] WHERE Dyelot = '" + Number.Text + "' and ReDye = '" + ReDye.Text + "'";//单号查询语句            
+            string DYELOTS_sql = "SELECT count(*) FROM [dbo].[DYELOTS_RECIPE] WHERE Dyelot = '" + Number.Text + "' and ReDye = '" + ReDye.Text + "'";//单号查询语句            
             try
             {
                 await conn_SC.OpenAsync();    //打开数据连接
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index 4593619..57763fc 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -79,9 +79,9 @@ namespace formula_manage.ViewModel
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
             }
 
-            string Stuff_sql = "SELECT ProductCode ,ProductName ,ProductType ,Concentration FROM [Dispensing].[dbo].[PRODUCT] order by ProductCode asc";//查询STUFF语句
-            string MAC_sql = "SELECT Name ,Capacity ,Volume FROM [Dispensing].[dbo].[MACHINE] order by Name asc";//查询machine语句
-            string Dissolve_sql = "SELECT DissolveCode ,DissolveName ,MaterialType ,WeightMIN ,WeightMAX REMARK FROM [Dispensing].[dbo].[Dissolve]";//查询语句       
+            string Stuff_sql = "SELECT ProductCode ,ProductName ,ProductType ,Concentration FROM [dbo].[PRODUCT] order by ProductCode asc";//查询STUFF语句
+            string MAC_sql = "SELECT Name ,Capacity ,Volume FROM [dbo].[MACHINE] order by Name asc";//查询machine语句
+            string Dissolve_sql = "SELECT DissolveCode ,DissolveName ,MaterialType ,WeightMIN ,WeightMAX REMARK FROM [dbo].[Dissolve]";//查询语句       
 
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
             try