Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Windows/Sql.xaml

@@ -15,7 +15,7 @@
         <TextBox x:Name="TEXT_SQLNAME" Height="20" Margin="80,80,20,0" TextWrapping="Wrap" Text="Dispensing" VerticalAlignment="Top"/>
         <TextBox x:Name="TEXT_SQLUSER" Height="20" Margin="80,110,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>
         <TextBox x:Name="TEXT_SQLPASWORD" Height="20" Margin="80,140,20,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" />
-        <CheckBox x:Name="TEXT_SQLINK" Height="19" Margin="80,170,20,0" VerticalAlignment="Top" Content="连接对象" IsTabStop="False" />
+        <CheckBox x:Name="TEXT_SQLINK" Height="19" Margin="80,170,20,0" VerticalAlignment="Top" Content="连接对象数据库" IsTabStop="False" Checked="TEXT_SQLINK_Checked" Unchecked="TEXT_SQLINK_Checked"/>
         <TextBox x:Name="TEXT_SQLIP2" Height="20" Margin="80,190,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />
         <TextBox x:Name="TEXT_SQLNAME2" Height="20" Margin="80,250,20,0" TextWrapping="Wrap" Text="BatchDyeingCentral" VerticalAlignment="Top" />
         <TextBox x:Name="TEXT_SQLUSER2" Height="20" Margin="80,280,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>
@@ -26,5 +26,16 @@
         </ComboBox>
         <Button Content="保存" HorizontalAlignment="Right" Height="24" Margin="0,362,40,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click"/>
         <Button Content="测试" HorizontalAlignment="Left" Height="24" Margin="40,362,0,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click_1"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,20,0,0" TextWrapping="Wrap" Text="服务器:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,50,0,0" TextWrapping="Wrap" Text="模式:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,80,0,0" TextWrapping="Wrap" Text="数据库:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,110,0,0" TextWrapping="Wrap" Text="登录名:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,140,0,0" TextWrapping="Wrap" Text="密码:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,190,0,0" TextWrapping="Wrap" Text="服务器:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,220,0,0" TextWrapping="Wrap" Text="模式:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,250,0,0" TextWrapping="Wrap" Text="数据库:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,280,0,0" TextWrapping="Wrap" Text="登录名:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,310,0,0" TextWrapping="Wrap" Text="密码:" VerticalAlignment="Top" Width="60" FontSize="16"/>
+
     </Grid>
 </Window>

Windows/Sql.xaml.cs

@@ -15,6 +15,7 @@ using System.Data.SqlClient;
 using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
 using System.ComponentModel;
+using System.Data.SqlTypes;
 
 namespace formula_manage.Windows
 {
@@ -75,6 +76,7 @@ namespace formula_manage.Windows
         int SQL_MOD;
         int SQL_MOD1;
         int i;
+        bool SQL2;
 
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
@@ -83,18 +85,27 @@ namespace formula_manage.Windows
 
             IniFiles Configini = new IniFiles(INIPath);
 
+
+
             TEXT_SQLIP.Text = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
             TEXT_SQLNAME.Text = Configini.IniReadvalue("SQL_SERVER", "SQL2");
             TEXT_SQMOD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL3");
             TEXT_SQLUSER.Text = Configini.IniReadvalue("SQL_SERVER", "SQL4");
             TEXT_SQLPASWORD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL5");
-            TEXT_SQLINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6"));
+            SQL2 = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6"));  //数据库对象2是否生效
             TEXT_SQLIP2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL7");
             TEXT_SQLNAME2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL8");
             TEXT_SQMOD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL9");
             TEXT_SQLUSER2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL10");
             TEXT_SQLPASWORD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL11");
 
+            TEXT_SQLINK.IsChecked = SQL2;       //数据库对象2控件属性
+            TEXT_SQLIP2.IsEnabled = SQL2;
+            TEXT_SQLNAME2.IsEnabled = SQL2;
+            TEXT_SQMOD2.IsEnabled = SQL2;
+            TEXT_SQLUSER2.IsEnabled = SQL2;
+            TEXT_SQLPASWORD2.IsEnabled = SQL2;
+
             int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i);   //读数据库状态配置文件
             if (i == 0) TEXT_SQMOD.Text = "Windows 身份认证";
             else TEXT_SQMOD.Text = "SQL SERVER 身份认证";
@@ -111,18 +122,23 @@ namespace formula_manage.Windows
             if (TEXT_SQMOD2.Text == "Windows 身份认证") SQL_MOD1 = 0;
             else SQL_MOD1 = 1;
 
+            SQL2 = TEXT_SQLINK.IsChecked.GetValueOrDefault();    //数据库对象2是否生效
+
             IniFiles Configini = new IniFiles(INIPath);   //配置文件
             Configini.IniWritevalue("SQL_SERVER", "SQL1", TEXT_SQLIP.Text);   //保存的配置
             Configini.IniWritevalue("SQL_SERVER", "SQL2", TEXT_SQLNAME.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL3", SQL_MOD.ToString());
             Configini.IniWritevalue("SQL_SERVER", "SQL4", TEXT_SQLUSER.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL5", TEXT_SQLPASWORD.Text);
-            Configini.IniWritevalue("SQL_SERVER", "SQL6", TEXT_SQLINK.IsChecked.ToString());
+            Configini.IniWritevalue("SQL_SERVER", "SQL6", SQL2.ToString());
+            if (SQL2)     //数据库对象2生效则保存对象2配置
+            {
                 Configini.IniWritevalue("SQL_SERVER", "SQL7", TEXT_SQLIP2.Text);
                 Configini.IniWritevalue("SQL_SERVER", "SQL8", TEXT_SQLNAME2.Text);
                 Configini.IniWritevalue("SQL_SERVER", "SQL9", SQL_MOD1.ToString());
                 Configini.IniWritevalue("SQL_SERVER", "SQL10", TEXT_SQLUSER2.Text);
                 Configini.IniWritevalue("SQL_SERVER", "SQL11", TEXT_SQLPASWORD2.Text);
+            }
             System.Windows.MessageBox.Show("保存完成");
             this.Close();   //退出窗口
         }
@@ -131,5 +147,16 @@ namespace formula_manage.Windows
         {
 
         }
+
+        private void TEXT_SQLINK_Checked(object sender, RoutedEventArgs e)
+        {
+            SQL2 = TEXT_SQLINK.IsChecked.GetValueOrDefault();    //数据库对象2是否生效
+
+            TEXT_SQLIP2.IsEnabled = SQL2;      //数据库对象2控件属性
+            TEXT_SQLNAME2.IsEnabled = SQL2;
+            TEXT_SQMOD2.IsEnabled = SQL2;
+            TEXT_SQLUSER2.IsEnabled = SQL2;
+            TEXT_SQLPASWORD2.IsEnabled = SQL2;
+        }
     }
 }