工艺程序管理

View/ProgramgroupView.xaml.cs

@@ -90,6 +90,7 @@ namespace DyeingComputer.View
             SQLiteHelpers.InsertData("ProgramName", Program_new);// 执行插入
             SQLiteHelpers.Close();  //关闭连接
 
+            Programgroup_Numder = VALUE;
             Programgroup_ID = ID;
 
             Programgroup_sql();
@@ -97,6 +98,7 @@ namespace DyeingComputer.View
 
         private void ProgramgroupView_del_Click(object sender, RoutedEventArgs e)//删除
         {
+            if(Programgroup_Numder == null)return;
             ///弹窗提示确认删除
             if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + Programgroup_Numder, "Delete ",
                 System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)

View/ProgramstepsView .xaml.cs

@@ -9,6 +9,7 @@ using System.Data.SQLite;
 using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using System.Net;
+using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -23,6 +24,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using static DyeingComputer.UserClass.SqliteHelper;
+using static DyeingComputer.Windows.ViewStep;
 
 namespace DyeingComputer.View
 {
@@ -54,7 +56,7 @@ namespace DyeingComputer.View
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库
 
-            string sql_script = "select * from ProgramSteps where ProgramID='" + ProgramID + "' order by Step desc";
+            string sql_script = "select * from ProgramSteps where ProgramID='" + ProgramID + "' order by Step asc";
 
             if (sql != null) sql.Clear();  //清空缓存
             sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
@@ -97,10 +99,40 @@ namespace DyeingComputer.View
 
         private void ProgramgroupView_edit_Click(object sender, RoutedEventArgs e)//编辑
         {
+            if(ID == null) ID = sql.Tables[0].Rows.Count.ToString();
             ViewStep viewstop = new ViewStep();
+            viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
             viewstop.data = ID;
             viewstop.ShowDialog();
         }
+        private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
+        {
+            int i = sql.Tables[0].Rows.Count;
+            int n = StrToInt.To16Convert10(ID);
+            if (i == n)
+            {
+                DataRow dr_ = sql.Tables[0].NewRow();//添加表数据
+                dr_["ProgramID"] = ProgramID;
+                dr_["Program"] = ProgramNAME;
+                sql.Tables[0].Rows.Add(dr_);
+                Dat();
+                ID = (n+1).ToString();
+            }
+
+            DataRow dr = sql.Tables[0].Rows[n-1];
+            dr.BeginEdit();
+            dr["StepID"] = e.StepID;
+            dr["StepName"] = e.StepNAME;
+            dr["ParameterName"] = e.PNAME;
+            dr["Parameter1"] = e.P1;
+            dr["Parameter2"] = e.P2;
+            dr["Parameter3"] = e.P3;
+            dr["Parameter4"] = e.P4;
+            dr["Parameter5"] = e.P5;
+            dr.EndEdit();
+
+            Grid.ItemsSource = sql.Tables[0].DefaultView;
+        }
 
         private void ProgramgroupView_Quit_Click(object sender, RoutedEventArgs e)//退出
         {
@@ -173,25 +205,6 @@ namespace DyeingComputer.View
             }
         }
 
-        
-        public struct Date
-        {
-            public string Step { get; set; }
-            public string StepID { get; set; }
-            public string StepNAME { get; set; }
-            public string PNAME { get; set; }
-            public string P1 { get; set; }
-            public string P2 { get; set; }
-            public string P3 { get; set; }
-            public string P4 { get; set; }
-            public string P5 { get; set; }
-            public string P6 { get; set; }
-            public string P7 { get; set; }
-            public string P8 { get; set; }
-            public string P9 { get; set; }
-            public string P10 { get; set; }
-
-        }
 
     }