diff --git a/EX/ExProgram.xaml b/EX/ExProgram.xaml
index 6521b3b..e93957d 100644
--- a/EX/ExProgram.xaml
+++ b/EX/ExProgram.xaml
@@ -7,6 +7,19 @@
mc:Ignorable="d"
Title="ExProgram" Height="450" Width="800">
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Login.xaml.cs b/Login.xaml.cs
index a772284..74edf49 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -150,6 +150,12 @@ namespace formula_manage
DBCLINK.Visibility = Visibility.Hidden;
EXLINK.Visibility = Visibility.Hidden;
USERLINK.Visibility = Visibility.Hidden;
+ DISPENLINK.Background = Brushes.Red;
+ }
+
+ if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
+ {
+ EXLINK.Background = Brushes.Red;
}
TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
@@ -176,8 +182,8 @@ namespace formula_manage
{
DISPENLINK.Background = Brushes.Red; //连接失败红色
System.Windows.MessageBox.Show("连接数据库失败");
- Windows.Sql sql = new Windows.Sql();
- sql.ShowDialog();//实例化并置顶打开数据库设置窗口
+ //Windows.Sql sql = new Windows.Sql();
+ //sql.ShowDialog();//实例化并置顶打开数据库设置窗口
return;
}
conn_SC.Close(); //关闭连接
diff --git a/Windows/APP_set.xaml b/Windows/APP_set.xaml
index 58bacfc..26486c5 100644
--- a/Windows/APP_set.xaml
+++ b/Windows/APP_set.xaml
@@ -9,9 +9,11 @@
-
-
-
+
+
+
+
+
diff --git a/Windows/APP_set.xaml.cs b/Windows/APP_set.xaml.cs
index 9a4e2d8..e0a68ef 100644
--- a/Windows/APP_set.xaml.cs
+++ b/Windows/APP_set.xaml.cs
@@ -41,7 +41,7 @@ namespace formula_manage.Windows
Configini.IniWritevalue("SOFTWARE_SET", " L3", Loginanew.ToString());
Configini.IniWritevalue("SOFTWARE_SET", " L4", LoginMAC.ToString());
Configini.IniWritevalue("SOFTWARE_SET", " L5", Login_Gkg.Text);
-
+ Configini.IniWritevalue("SOFTWARE_SET", " L6", EXlink.ToString());
Configini.IniWritevalue("SOFTWARE_SET", " T1", Prepose.Text);
Configini.IniWritevalue("SOFTWARE_SET", " T2", TimeFormat.Text);
@@ -60,6 +60,7 @@ namespace formula_manage.Windows
bool Loginprint;
bool Loginanew;
bool LoginMAC;
+ bool EXlink;
private void Window_SET(object sender, RoutedEventArgs e)
{
@@ -69,6 +70,8 @@ namespace formula_manage.Windows
Login_PRINT.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2")); //是否立即打印料单
Login_anew.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3")); //是否立即打印料单
Login_MACHINE.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4")); //允许自定义机台
+ EXLINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")); //ex
+
Login_Gkg.Text = Configini.IniReadvalue("SOFTWARE_SET", "L5"); //单位识别
Prepose.Text = Configini.IniReadvalue("SOFTWARE_SET", "T1"); //自定义料单前缀
@@ -82,6 +85,11 @@ namespace formula_manage.Windows
Loginlink = Login_LINK.IsChecked.GetValueOrDefault(); //显示是否生效
}
+ private void Login_ex_Checked(object sender, RoutedEventArgs e)
+ {
+ EXlink = EXLINK.IsChecked.GetValueOrDefault(); //是否
+ }
+
private void Login_MAC_Checked(object sender, RoutedEventArgs e)
{
LoginMAC = Login_MACHINE.IsChecked.GetValueOrDefault(); //是否