From fedcf6abdc664ef311eaa3c7cacf42b16877feec Mon Sep 17 00:00:00 2001
From: sc <2401809606@qq.com>
Date: Thu, 23 Nov 2023 13:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BD=93=E5=89=8D=E5=8D=95?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.xaml.cs | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ea1e37e..8c142b7 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -29,7 +29,6 @@ using formula_manage.ViewModel;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using static System.Net.Mime.MediaTypeNames;
 using formula_manage.UserClass;
-//using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 
 namespace formula_manage
@@ -39,6 +38,7 @@ namespace formula_manage
     /// </summary>
     public partial class MainWindow : Window
     {
+
         bool quit = false;
 
         DataTable DissolvedataTable = new DataTable();   //建立Dissolve缓存
@@ -55,12 +55,11 @@ namespace formula_manage
         string TEXT_SQLUSER;
         string TEXT_SQLPASWOR;
         string Connstr_SC;
+        int ID_N = 1;
 
         public MainWindow()
         {
-            DataContext =new MainWindowViewModel();
-
-            int ID_N = 1;
+            DataContext =new MainWindowViewModel();        
 
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
@@ -114,13 +113,13 @@ namespace formula_manage
             row["STEP"] = Procedures_P.Text;
             RRODUCTdataTable.Rows.Add(row);
 
-            for (ID_N = 2; ID_N <= 64; ID_N++)
+        /*    for (ID_N = 2; ID_N <= 64; ID_N++)
             {
                 row = RRODUCTdataTable.NewRow();
                 row["ID"] = ID_N;
          //       row["STEP"] = Procedures_P.Text;
                 RRODUCTdataTable.Rows.Add(row);
-            }
+            }*/
 
             Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
         }
@@ -241,6 +240,7 @@ namespace formula_manage
         string PreposeT;  //料单时间
         string PreposeS;  //料单序列格式
         int PreposeSl;
+        string str_Prepose;
         bool Loginprint;
         bool Loginanew; 
 
@@ -254,6 +254,7 @@ namespace formula_manage
             Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间
             PreposeS = Configini.IniReadvalue("SOFTWARE_SET", "T3");  //自定义料单格式
+            PreposeSl = int.Parse(PreposeS);
 
             Number_Event();
             //Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT);  //生成料单号
@@ -264,9 +265,9 @@ namespace formula_manage
             int preposeL = PreposeS.Length;
 
             PreposeSl = PreposeSl + 1;
-            string str = String.Format("{0:D"+ preposeL + "}", PreposeSl);
+            str_Prepose = String.Format("{0:D"+ preposeL + "}", PreposeSl);
 
-            Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT) + str;  //生成料单号
+            Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT) + str_Prepose;  //生成料单号
         }
 
         private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
@@ -400,6 +401,10 @@ namespace formula_manage
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";
          RecipedataTable =  RRODUCTdataTable;
+
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);  //记录当前单序号
+            Configini.IniWritevalue("SOFTWARE_SET", " T3", str_Prepose);  
+
         }
 
         private void Button_NewOrder(object sender, RoutedEventArgs e) //新料单按钮
@@ -483,18 +488,20 @@ namespace formula_manage
             {
                 PressKey.PressKeys(Keys.Right, false);
                 PressKey.PressKeys(Keys.Right, true);
-                PressKey.PressKeys(Keys.Up, false);
-                PressKey.PressKeys(Keys.Up, true);
+             //   PressKey.PressKeys(Keys.Up, false);
+             //   PressKey.PressKeys(Keys.Up, true);
                 PressKey.PressKeys(Keys.Tab, false);
                 PressKey.PressKeys(Keys.Tab, true);
 
                 System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox;
-                curComboBox.SelectedIndex = 1;
-
-                DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true);   //实时更新datagrid
+                curComboBox.SelectedIndex = -1;
 
-                    
+               
+                
+               
             }
+            DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true);   //实时更新datagrid
+        
         }
 
         private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
@@ -506,10 +513,18 @@ namespace formula_manage
                 PressKey.PressKeys(Keys.Tab, false);
                 PressKey.PressKeys(Keys.Tab, true);
 
-            
+                DataRow row = RRODUCTdataTable.NewRow();  //ID列
+                row = RRODUCTdataTable.NewRow();
+                ID_N++;
+                row["ID"] = ID_N;
+                //       row["STEP"] = Procedures_P.Text;
+                RRODUCTdataTable.Rows.Add(row);
+
+
             }
 
 
+            DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true);   //实时更新datagrid
         }