diff --git a/Login.xaml b/Login.xaml
index 745ae05..4b040e4 100644
--- a/Login.xaml
+++ b/Login.xaml
@@ -18,9 +18,12 @@
         <PasswordBox x:Name="Pasword" Height="24" Margin="60,210,10,0" VerticalAlignment="Top" FontSize="14" KeyUp="SearchBox_OnKeyDownd"/>
         <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,163,0,0" TextWrapping="Wrap" Text="账号:" VerticalAlignment="Top" Width="45" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
         <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,208,0,0" TextWrapping="Wrap" Text="密码:" VerticalAlignment="Top" Width="45" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
-        <Button x:Name="logon" Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
-        <Button Content="退出" HorizontalAlignment="Left" Height="23" Margin="140,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
+        <Button x:Name="logon" Content="登录" HorizontalAlignment="Left" Height="33" Margin="40,264,0,0" VerticalAlignment="Top" Width="64" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
+        <Button Content="退出" HorizontalAlignment="Right" Height="33" Margin="140,264,40,0" VerticalAlignment="Top" Width="64" Click="Button_Click" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
         <TextBlock Height="30" Margin="15,115,15,0" TextWrapping="Wrap" Text="尚彩科技单据管理系统" VerticalAlignment="Top" FontSize="20"/>
-
+        <TextBox x:Name="DISPENLINK" HorizontalAlignment="Left" Height="15" Margin="0,0,0,0" TextWrapping="Wrap" Text="DISPEN" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
+        <TextBox x:Name="DBCLINK" HorizontalAlignment="Left" Height="15" Margin="50,0,0,0" TextWrapping="Wrap" Text="DBC" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
+        <TextBox x:Name="EXLINK" HorizontalAlignment="Left" Height="15" Margin="100,0,0,0" TextWrapping="Wrap" Text="EX" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
+        <TextBox x:Name="USERLINK" HorizontalAlignment="Left" Height="15" Margin="150,0,0,0" TextWrapping="Wrap" Text="USER" VerticalAlignment="Bottom" Width="98" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
     </Grid>
 </Window>
diff --git a/Login.xaml.cs b/Login.xaml.cs
index a5fa800..59cde87 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -69,16 +69,30 @@ namespace formula_manage
         string TEXT_SQLUSER;
         string TEXT_SQLPASWOR;
         string Connstr_SC;
+        string Connstr_DBC;
+        bool SQL2;
+        bool Login_link;
         private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
             logon.IsEnabled = false;  //关闭登录按钮
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+
+            // Login_link = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
+            if ( !Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1")))//连接状态显示是否生效
+            {
+                DISPENLINK.Visibility = Visibility.Hidden;  //不显示
+                DBCLINK.Visibility = Visibility.Hidden;
+                EXLINK.Visibility = Visibility.Hidden;
+                USERLINK.Visibility = Visibility.Hidden;
+            }
+
             TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
             TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
             TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
             TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
             TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+            SQL2 = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6"));  //数据库对象2是否生效
             if (TEXT_SQMOD == "0")  //判断连接方式
             {
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
@@ -88,21 +102,51 @@ namespace formula_manage
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
             }
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);
-         //   conn_SC.Open();
+
             try
             {
                await conn_SC.OpenAsync();
             }catch (Exception) 
             {
+                DISPENLINK.Background = Brushes.Red; //连接失败红色
                 System.Windows.MessageBox.Show("连接数据库失败");
-
                 Windows.Sql sql = new Windows.Sql();
                 sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
-
                 return;
-            }   
-                
+            }                  
             conn_SC.Close();  //关闭连接
+            DISPENLINK.Background = Brushes.Green; //连接成功绿色
+
+            if (SQL2)     //数据库对象2生效则检查
+            {
+                TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL7");    //读配置文件
+                TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL8");
+                TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL9");
+                TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL10");
+                TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL11");
+                if (TEXT_SQMOD == "0")  //判断连接方式
+                {
+                    Connstr_DBC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
+                }
+                else
+                {
+                    Connstr_DBC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
+                }
+                SqlConnection conn_DBC = new SqlConnection(Connstr_DBC);
+
+                try 
+                {
+                    await conn_DBC.OpenAsync();
+                }catch (Exception) 
+                {
+                    DBCLINK.Background = Brushes.Red; //连接失败红色
+                    System.Windows.MessageBox.Show("连接数据库失败");
+                    Windows.Sql sql = new Windows.Sql();
+                    sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
+                    return;
+                }
+                DBCLINK.Background = Brushes.Green; //连接成功绿色
+            }
 
             logon.IsEnabled = true;  //允许登录按钮
             UserClass.PressKey.PressKeys(Keys.Tab, false);
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 8369a1c..3ad07d5 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -12,16 +12,19 @@
                 <MenuItem Header="_数据库设置" FontSize="16" Click="SQL"/>
                 <MenuItem Header="_备份/还原" FontSize="16"/>
                 <Separator/>
-                <MenuItem Header="_料单设置" FontSize="16"/>
+                <MenuItem Header="_软件设置" FontSize="16" Click="SOFTWARE_SET"/>
                 <MenuItem Header="_用户设置" FontSize="16"/>
                 <Separator/>
                 <MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
             </MenuItem>
             <MenuItem Header="_管理" FontSize="16">
-                <MenuItem Header="_染机管理" FontSize="16"/>
-                <MenuItem Header="_原料管理" FontSize="16" Click="STUFF"/>
-                <MenuItem Header="_配方管理" FontSize="16"/>
-                <MenuItem Header="_工艺管理" FontSize="16"/>
+                <MenuItem Header="_染色机管理" FontSize="16"/>
+                <MenuItem Header="_原料信息管理" FontSize="16" Click="STUFF"/>
+                <Separator/>
+                <MenuItem Header="_预设配方管理" FontSize="16"/>
+                <MenuItem Header="_预设工艺管理" FontSize="16"/>
+                <Separator/>
+                <MenuItem Header="_料单模板管理" FontSize="16"/>
                 <Separator />
                 <MenuItem Header="其它...">
                     <MenuItem Header="_品名" FontSize="16"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 69e4a04..5af8341 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -31,6 +31,13 @@ namespace formula_manage
             Windows.Sql sql= new Windows.Sql();
             sql.ShowDialog();//实例化并置顶打开数据库设置窗口              
         }
+
+        private void SOFTWARE_SET(object sender, RoutedEventArgs e)
+        {
+            Windows.APP_set APP_set = new Windows.APP_set();
+            APP_set.ShowDialog();//实例化并置顶打开设置窗口    
+        }
+
         private void HELP(object sender, RoutedEventArgs e)
         {
             Help help_page = new Help();
diff --git a/Windows/APP_set.xaml b/Windows/APP_set.xaml
new file mode 100644
index 0000000..2755c88
--- /dev/null
+++ b/Windows/APP_set.xaml
@@ -0,0 +1,13 @@
+<Window x:Class="formula_manage.Windows.APP_set"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:formula_manage.Windows"
+        mc:Ignorable="d" Loaded="Window_SET"
+        Title="APP_set" Height="450" Width="800">
+    <Grid>
+        <CheckBox x:Name="Login_LINK" Height="19" Margin="15,15,605,0" VerticalAlignment="Top" Content="登录页面显示连接状态" IsTabStop="False" Checked="Login_LINK_Checked" Unchecked="Login_LINK_Checked"/>
+
+    </Grid>
+</Window>
diff --git a/Windows/APP_set.xaml.cs b/Windows/APP_set.xaml.cs
new file mode 100644
index 0000000..92cc6d3
--- /dev/null
+++ b/Windows/APP_set.xaml.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace formula_manage.Windows
+{
+    /// <summary>
+    /// APP_set.xaml 的交互逻辑
+    /// </summary>
+    public partial class APP_set : Window
+    {
+        public APP_set()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            InitializeComponent();
+        }
+        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
+
+        bool Login_link;
+        private void Window_SET(object sender, RoutedEventArgs e)
+        {
+
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+
+            Login_link = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
+           
+        }
+        private void Login_LINK_Checked(object sender, RoutedEventArgs e)
+        {
+            Login_link = Login_LINK.IsChecked.GetValueOrDefault();    //显示是否生效
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
+            Configini.IniWritevalue("SOFTWARE_SET", " L1", Login_link.ToString());
+        }
+    }
+}
diff --git a/Windows/Sql.xaml.cs b/Windows/Sql.xaml.cs
index 154030b..9f70d89 100644
--- a/Windows/Sql.xaml.cs
+++ b/Windows/Sql.xaml.cs
@@ -55,7 +55,7 @@ namespace formula_manage.Windows
             TEXT_SQLUSER2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL10");
             TEXT_SQLPASWORD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL11");
 
-            TEXT_SQLINK.IsChecked = SQL2;       //数据库对象2控件属性
+            TEXT_SQLINK.IsChecked = SQL2;       //数据库对象2控件属性是否生效
             TEXT_SQLIP2.IsEnabled = SQL2;
             TEXT_SQLNAME2.IsEnabled = SQL2;
             TEXT_SQMOD2.IsEnabled = SQL2;
diff --git a/formula_manage.csproj b/formula_manage.csproj
index 3d57e40..133ba38 100644
--- a/formula_manage.csproj
+++ b/formula_manage.csproj
@@ -82,6 +82,9 @@
     </Compile>
     <Compile Include="UserClass\IniFile.cs" />
     <Compile Include="UserClass\PressKey.cs" />
+    <Compile Include="Windows\APP_set.xaml.cs">
+      <DependentUpon>APP_set.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\Sql.xaml.cs">
       <DependentUpon>Sql.xaml</DependentUpon>
     </Compile>
@@ -111,6 +114,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Windows\APP_set.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\Sql.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>