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

MainWindow.xaml.cs

@@ -109,6 +109,7 @@ namespace formula_manage
             row["ID"] = ID_N;
             row["STEP"] = Procedures_P.Text;
             row["UNIT"] = "g";
+            //row["SHIFT"] = "g";
             RRODUCTdataTable.Rows.Add(row);
 
             Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
@@ -450,6 +451,7 @@ namespace formula_manage
             }
         }
 
+        string Name_;
         string Type_;
         string Conc_;
         double Weight_=0;
@@ -460,10 +462,10 @@ namespace formula_manage
             if (e.Key == Key.Enter)
             {
                 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())
                 {
@@ -471,20 +473,30 @@ namespace formula_manage
                     curComboBox.Text = "";
                     return;
                 }
+                
 
 
-                string Name_ = r[0].ItemArray[1].ToString();
+                Name_ = r[0].ItemArray[1].ToString();
                 Type_ = r[0].ItemArray[2].ToString();
                 Conc_ = r[0].ItemArray[3].ToString();
+
                 if (double.TryParse(list_Weight.Text, out ang))
                 {
                     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());
 
-
+                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, true);
@@ -527,7 +539,7 @@ namespace formula_manage
                     row = RRODUCTdataTable.NewRow();
                     ID_N++;
                     row["ID"] = ID_N;
-                    row["STEP"] = "1";
+                   // row["STEP"] = "1";
                     row["UNIT"] = "g";
                     //       row["STEP"] = Procedures_P.Text;
                     RRODUCTdataTable.Rows.Add(row);