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

MainWindow.xaml.cs

@@ -35,6 +35,7 @@ namespace DyeingComputer
         }
 
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
+      
         private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
 
         /// <summary>

View/WorkOrderView.xaml.cs

@@ -89,7 +89,7 @@ namespace DyeingComputer.View
         private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
         {
             ///弹窗提示确认删除
-            if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder + "?", "SUNLIGHT ",
+            if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder , "Delete ",
                 System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
             {
                 ///执行删除
@@ -103,7 +103,15 @@ namespace DyeingComputer.View
 
         private void WorkOrderView_redy_Click(object sender, RoutedEventArgs e)//重染按钮
         {
-
+            string WorkNum = MainWindowViewModel.WorkNumder.ToString();
+            if (WorkNum !=null) 
+            {
+                if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Redye + WorkNum, "Redye ",
+                   System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
+                {
+                    ///执行重染
+                } 
+            }
         }
 
         private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件

ViewModel/MainWindowViewModel.cs

@@ -73,11 +73,14 @@ namespace DyeingComputer.ViewModel
             // disTimer.Interval = new TimeSpan(10000000); //时间间隔为一秒。
             // disTimer.Start();//计时开始
         }
+
+        public static object WorkNumder;
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件
         {
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
             Work_Temp = "130"+"  ℃";
             Work_Numder = "r2024011200014";
+            WorkNumder = Work_Numder;
             Status_Str = "qweqeqwqqfwfqef";
         }
     }