diff --git a/MainWindow.xaml b/MainWindow.xaml
index 4e5b3b7..b7d9319 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -56,7 +56,7 @@
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 5167136..3d5a07a 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -542,7 +542,12 @@ namespace formula_manage
int P = int.Parse(Procedures_P.Text);
if (P > 1) Procedures_P.Text = (P - 1).ToString();
}
-
+
+ private void Button_Order(object sender, RoutedEventArgs e)
+ {
+ Deputy.Content = new View.ViewOrder(); //打开工艺选择
+ }
+
private void Button_Technology(object sender, RoutedEventArgs e)
{
Deputy.Content = new View.ViewProcess(); //打开工艺选择
diff --git a/View/ViewOrder.xaml b/View/ViewOrder.xaml
new file mode 100644
index 0000000..0887ad0
--- /dev/null
+++ b/View/ViewOrder.xaml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/ViewOrder.xaml.cs b/View/ViewOrder.xaml.cs
new file mode 100644
index 0000000..5b88db1
--- /dev/null
+++ b/View/ViewOrder.xaml.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace formula_manage.View
+{
+ ///
+ /// ViewProcess.xaml 的交互逻辑
+ ///
+ public partial class ViewOrder: UserControl
+ {
+ public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
+
+ string TEXT_SQLIP;
+ string TEXT_SQLNAME;
+ string TEXT_SQMOD;
+ string TEXT_SQLUSER;
+ string TEXT_SQLPASWOR;
+ string Connstr_SC;
+
+ public ViewOrder()
+ {
+ InitializeComponent();
+ sql_();
+ }
+
+ private async void sql_()
+ {
+ UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
+ TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
+ TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
+ TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
+ TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
+ TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+ if (TEXT_SQMOD == "0") //判断连接方式
+ {
+ Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
+ }
+ else
+ {
+ Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
+ }
+ string MAC_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER]";//查询语句
+
+ SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
+ try
+ {
+ await conn_SC.OpenAsync(); //打开数据连接
+ SqlDataAdapter Stuff_data = new SqlDataAdapter(MAC_sql, Connstr_SC); //查询
+
+ DataTable dataTable = new DataTable(); //建立缓存
+ Stuff_data.Fill(dataTable); //查询结果存入缓存
+ conn_SC.Close(); //关闭连接
+
+ Order.ItemsSource = dataTable.DefaultView; //数据加入表格
+ //Order.DisplayMemberPath = "Name";
+ }
+ catch (Exception)
+ {
+ System.Windows.MessageBox.Show("请求信息失败，检查连接");
+ return;
+ }
+ }
+ }
+}
diff --git a/formula_manage.csproj b/formula_manage.csproj
index db8b8c2..38b6f26 100644
--- a/formula_manage.csproj
+++ b/formula_manage.csproj
@@ -216,6 +216,9 @@
Formula.xaml
+
+ ViewOrder.xaml
+
ViewProcess.xaml
@@ -274,6 +277,10 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile