diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 3aed7f3..e92684a 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -123,6 +123,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 edit 的本地化字符串。
+ ///
+ public static string edit {
+ get {
+ return ResourceManager.GetString("edit", resourceCulture);
+ }
+ }
+
///
/// 查找类似 EndTime 的本地化字符串。
///
@@ -285,6 +294,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Rename 的本地化字符串。
+ ///
+ public static string Rename {
+ get {
+ return ResourceManager.GetString("Rename", resourceCulture);
+ }
+ }
+
///
/// 查找类似 StartTime 的本地化字符串。
///
@@ -303,6 +321,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Step 的本地化字符串。
+ ///
+ public static string Step {
+ get {
+ return ResourceManager.GetString("Step", resourceCulture);
+ }
+ }
+
///
/// 查找类似 SystemDataLoss 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 18c2399..ec3d069 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -219,4 +219,13 @@
Confirm
+
+ Step
+
+
+ Edit
+
+
+ Rename
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 70ee606..bd0afad 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -219,4 +219,13 @@
State
+
+ edit
+
+
+ Rename
+
+
+ Step
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 004bddf..9cb1990 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -219,4 +219,13 @@
确认
+
+ 步骤
+
+
+ 编辑
+
+
+ 重命名
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 5fc3cc1..30b26f1 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -219,4 +219,13 @@
確認
+
+ 步驟
+
+
+ 編輯
+
+
+ 重新命名
+
\ No newline at end of file
diff --git a/View/ProgramgroupView.xaml b/View/ProgramgroupView.xaml
index d7f1921..f62dc65 100644
--- a/View/ProgramgroupView.xaml
+++ b/View/ProgramgroupView.xaml
@@ -4,9 +4,63 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View"
+ xmlns:lang="clr-namespace:DyeingComputer.Properties"
mc:Ignorable="d"
- d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+ d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/ProgramgroupView.xaml.cs b/View/ProgramgroupView.xaml.cs
index 53d0713..842d448 100644
--- a/View/ProgramgroupView.xaml.cs
+++ b/View/ProgramgroupView.xaml.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
+using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -12,6 +14,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
+using static DyeingComputer.UserClass.SqliteHelper;
namespace DyeingComputer.View
{
@@ -23,6 +26,58 @@ namespace DyeingComputer.View
public ProgramgroupView()
{
InitializeComponent();
+ Programgroup_sql();
+ }
+
+ private SQLiteHelper SQLiteHelpers = null; //定义数据库
+ private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
+ DataSet sql; //内存数据缓存
+
+ public void Programgroup_sql()
+ {
+ SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+ SQLiteHelpers.Open(); //打开数据库
+
+ string sql_script = "select * from ProgramName";
+
+ if (sql != null) sql.Clear(); //清空缓存
+ sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存
+ if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
+
+ SQLiteHelpers.Close(); //关闭连接
+
+ //sql.Clear(); //清除缓存
+ //System.GC.Collect();
+ }
+
+ private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
+
+ private void ProgramgroupView_lock_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void ProgramgroupView_new_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void ProgramgroupView_del_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void ProgramgroupView_Rename_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void ProgramgroupView_Remark_Click(object sender, RoutedEventArgs e)
+ {
+
}
}
}
diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml
index 26e7c55..fd6a760 100644
--- a/View/WorkOrderView.xaml
+++ b/View/WorkOrderView.xaml
@@ -23,13 +23,15 @@
-
+ Background="White" SelectionMode="Single" FontSize="15" >