diff --git a/Login.xaml.cs b/Login.xaml.cs
index 4659aec..a772284 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -82,7 +82,13 @@ namespace formula_manage
Window window = Window.GetWindow(this);
MainWindow Main = new MainWindow();
window.Close();
- Main.ShowDialog();//实例化并置顶打开信息窗口
+
+ FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
+ StreamWriter wr = new StreamWriter(fs);//创建文件
+ wr.WriteLine(Log_time + "LOGon_ENGINEER");
+ wr.Close();
+
+ Main.ShowDialog();//实例化并置顶打开窗口
}
else
{
@@ -100,8 +106,13 @@ namespace formula_manage
Window window = Window.GetWindow(this);
MainWindow Main = new MainWindow();
window.Close();
+
+ FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
+ StreamWriter wr = new StreamWriter(fs);//创建文件
+ wr.WriteLine(Log_time + "LOGon_" + user);
+ wr.Close();
+
Main.ShowDialog();//实例化并置顶打开窗口
-
}
else
System.Windows.MessageBox.Show("账号或密码错误");
diff --git a/Windows/RECIPE.xaml.cs b/Windows/RECIPE.xaml.cs
index b0600ab..8a42c16 100644
--- a/Windows/RECIPE.xaml.cs
+++ b/Windows/RECIPE.xaml.cs
@@ -164,10 +164,9 @@ namespace formula_manage.Windows
{
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
Regex re_char = new Regex(@"^[A-Za-z0-9\s@()()/+!!_-]+$");//校验用正则表达式由数字,26个英文字母,空白字符和@()()/+!!_-组成的字符串
- string Dissolve_sql;
- int int_ion = 0;
-
-
+ // string Dissolve_sql;
+ // int int_ion = 0;
+
}
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
@@ -209,7 +208,7 @@ namespace formula_manage.Windows
private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//原料代码输入事件
{
- double ang;
+ //double ang;
if (e.Key == Key.Enter)
{
System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox;
@@ -329,7 +328,7 @@ namespace formula_manage.Windows
}
private void CP_PRODUCT_CODE_DropDownClosed(object sender, EventArgs e)//原料代码选择事件
{
- double ang;
+ //double ang;
System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox;
int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行
@@ -376,7 +375,7 @@ namespace formula_manage.Windows
}
private void CP_PRODUCT_NAME_DropDownClosed(object sender, EventArgs e)//原料名选择事件
{
- double ang;
+ //double ang;
System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox;
int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行
diff --git a/formula_manage.csproj b/formula_manage.csproj
index 04454d8..1e6ff23 100644
--- a/formula_manage.csproj
+++ b/formula_manage.csproj
@@ -12,10 +12,11 @@
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
- true
+ false
true
false
- publish\
+
+ C:\Users\24018\Desktop\
true
Disk
false
@@ -25,14 +26,14 @@
false
false
true
- 0
+ 1
1.0.0.%2a
false
+ true
true
-
- AnyCPU
+ x64
true
full
false
@@ -40,7 +41,7 @@
DEBUG;TRACE
prompt
4
- true
+ false
AnyCPU
@@ -52,7 +53,7 @@
4
- false
+ true
sunlight_logo.ico
@@ -100,6 +101,15 @@
formula_manage.App
+
+ 1C3E0723F5447A112A6B4FFA5E891F5D2074F15B
+
+
+ formula_manage_TemporaryKey.pfx
+
+
+ true
+
@@ -344,6 +354,7 @@
ResXFileCodeGenerator
Resources.Designer.cs
+
SettingsSingleFileGenerator