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

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

Browse Source
This commit is contained in:
sc committed 2023-11-24 01:51:45 +08:00
2 parents fa7882c34a e324cd18ff
commit a3fdfef542
1 file changed
+17 -5
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.xaml.cs
+17 -5
View File
@@ -109,6 +109,7 @@ namespace formula_manage
row["ID"] = ID_N; row["ID"] = ID_N;
row["STEP"] = Procedures_P.Text; row["STEP"] = Procedures_P.Text;
row["UNIT"] = "g"; row["UNIT"] = "g";
//row["SHIFT"] = "g";
RRODUCTdataTable.Rows.Add(row); RRODUCTdataTable.Rows.Add(row);
Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView; Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
@@ -450,6 +451,7 @@ namespace formula_manage
} }
} }
string Name_;
string Type_; string Type_;
string Conc_; string Conc_;
double Weight_=0; double Weight_=0;
@@ -460,10 +462,10 @@ namespace formula_manage
if (e.Key == Key.Enter) if (e.Key == Key.Enter)
{ {
System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox; System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox;
string a = curComboBox.Text; string Code_ = curComboBox.Text;
if (a == "") return; if (Code_ == "") return;
DataRow[] r = MainWindowViewModel.STUFFdatatemp.Select("ProductCode ='" + a + "'"); DataRow[] r = MainWindowViewModel.STUFFdatatemp.Select("ProductCode ='" + Code_ + "'");
if (!r.Any()) if (!r.Any())
{ {
@@ -473,17 +475,27 @@ namespace formula_manage
} }
string Name_ = r[0].ItemArray[1].ToString();
Name_ = r[0].ItemArray[1].ToString();
Type_ = r[0].ItemArray[2].ToString(); Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString(); Conc_ = r[0].ItemArray[3].ToString();
if (double.TryParse(list_Weight.Text, out ang)) if (double.TryParse(list_Weight.Text, out ang))
{ {
Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100; Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100;
} }
if ((Type_ == "0") || (Type_ == "3")) Type_ = "%";
if ((Type_ == "1") || (Type_ == "2")) Type_ = "g/L";
//RRODUCTdataTable.Load(r.ElementAt(1).ToString()); //RRODUCTdataTable.Load(r.ElementAt(1).ToString());
DataRow row = RRODUCTdataTable.Rows[ID_N-1]; //ID列
row.BeginEdit();
row["PRODUCT_CODE"] = Code_;
row["PRODUCT_NAME"] = Name_;
row["SHIFT"] = Type_;
row.EndEdit();
PressKey.PressKeys(Keys.Right, false); PressKey.PressKeys(Keys.Right, false);
@@ -527,7 +539,7 @@ namespace formula_manage
row = RRODUCTdataTable.NewRow(); row = RRODUCTdataTable.NewRow();
ID_N++; ID_N++;
row["ID"] = ID_N; row["ID"] = ID_N;
row["STEP"] = "1"; // row["STEP"] = "1";
row["UNIT"] = "g"; row["UNIT"] = "g";
// row["STEP"] = Procedures_P.Text; // row["STEP"] = Procedures_P.Text;
RRODUCTdataTable.Rows.Add(row); RRODUCTdataTable.Rows.Add(row);