sc/formula_manage
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Browse Source
This commit is contained in:
sc committed 2023-11-26 19:06:08 +08:00
2 parents 21ccf736d7 a110d93acc
commit 9301771bf9
1 file changed
+3 -6
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.xaml.cs
+3 -6
View File
@@ -114,7 +114,6 @@ namespace formula_manage
private void sql_() private void sql_()
{ {
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取 UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件 TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2"); TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
@@ -133,9 +132,6 @@ namespace formula_manage
list_Weight.Text = Configini.IniReadvalue("SOFTWARE_SET", "T4"); //自定义 list_Weight.Text = Configini.IniReadvalue("SOFTWARE_SET", "T4"); //自定义
list_Proportion.Text = Configini.IniReadvalue("SOFTWARE_SET", "T5"); //自定义 list_Proportion.Text = Configini.IniReadvalue("SOFTWARE_SET", "T5"); //自定义
list_Total.Text = (double.Parse(list_Proportion.Text) * double.Parse(list_Weight.Text)).ToString(); list_Total.Text = (double.Parse(list_Proportion.Text) * double.Parse(list_Weight.Text)).ToString();
} }
private async void Permissions_() private async void Permissions_()
@@ -393,14 +389,12 @@ namespace formula_manage
} }
if (result == MessageBoxResult.None) return; if (result == MessageBoxResult.None) return;
} }
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("数据访问失败，重试"); System.Windows.MessageBox.Show("数据访问失败，重试");
return; return;
} //单号重复检查 } //单号重复检查
if (Machine.Text =="") if (Machine.Text =="")
{ {
System.Windows.MessageBox.Show("请选择机台", "注意",MessageBoxButton.OK , MessageBoxImage.Question) ; System.Windows.MessageBox.Show("请选择机台", "注意",MessageBoxButton.OK , MessageBoxImage.Question) ;
@@ -417,6 +411,9 @@ namespace formula_manage
// SqlCommand insertcommand = new SqlCommand("INSERT INTO [Dispensing].[dbo].[DYELOTS_RECIPE]([CompanyName],[CompanyCode],[Address],[Owner],[Memo])" +"VALUES(@CompanyName, @CompanyCode,@Address,@Owner,@Memo)", conn_SC); // SqlCommand insertcommand = new SqlCommand("INSERT INTO [Dispensing].[dbo].[DYELOTS_RECIPE]([CompanyName],[CompanyCode],[Address],[Owner],[Memo])" +"VALUES(@CompanyName, @CompanyCode,@Address,@Owner,@Memo)", conn_SC);
Procedures_N.Text = "1"; Procedures_N.Text = "1";
Procedures_P.Text = "1"; Procedures_P.Text = "1";