diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index 2d96412..e9360dc 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -138,6 +138,9 @@
InputBox.xaml
+
+ ViewProgram.xaml
+
ViewStep.xaml
@@ -205,6 +208,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml
index 399320f..c8c1de5 100644
--- a/View/WorkOrderView.xaml
+++ b/View/WorkOrderView.xaml
@@ -10,6 +10,7 @@
xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
d:DataContext="{d:DesignInstance Type=viewmodel:WorkOrderViewModel}"
mc:Ignorable="d" KeyDown="UserControl_KeyDown"
+ Loaded="UserControl_Loaded"
d:DesignHeight="630" d:DesignWidth="1280" >
diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs
index ea20e07..428e3be 100644
--- a/View/WorkOrderView.xaml.cs
+++ b/View/WorkOrderView.xaml.cs
@@ -1,5 +1,6 @@
using DyeingComputer.UserClass;
using DyeingComputer.ViewModel;
+using DyeingComputer.Windows;
using ScottPlot;
using System;
using System.Collections.Generic;
@@ -19,6 +20,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Xml.Linq;
using static DyeingComputer.UserClass.SqliteHelper;
+using static DyeingComputer.Windows.ViewProgram;
using static System.Collections.Specialized.BitVector32;
namespace DyeingComputer.View
@@ -33,11 +35,23 @@ namespace DyeingComputer.View
DataContext = new WorkOrderViewModel();
InitializeComponent();
+ }
+ private void UserControl_Loaded(object sender, RoutedEventArgs e)
+ {
Workorder_sql();
WpfPlot();
- }
+ SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+ SQLiteHelpers.Open(); //打开数据库
+ string S09 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S09'", null).ToString(); //读取
+ string S10 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S10'", null).ToString();
+ string S11 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S11'", null).ToString();
+ SQLiteHelpers.Close();
+ if (S09 == "0") WorkOrderView_new.IsEnabled = false;//禁止用户新建
+ if (S10 == "0") WorkOrderView_del.IsEnabled = false;
+ if (S11 == "0") WorkOrderView_redy.IsEnabled = false;
+ }
private SQLiteHelper SQLiteHelpers = null; //定义数据库
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
DataSet sql; //内存数据缓存
@@ -109,9 +123,18 @@ namespace DyeingComputer.View
private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮
{
-
+ ViewProgram viewProgram = new ViewProgram();
+ viewProgram.AddressUpdated += new ViewProgram.AddressUpdateHandler(Address_ButtonClicked);
+ viewProgram.ShowDialog();
}
+ private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
+ {
+ MainWindowViewModel.WorkNumder = DateTime.Now.ToString("yyMMddHHmmss");
+ TechnologicalProcessView.workName = e.ID;
+ var _mainWindow = Application.Current.Windows.Cast().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
+ _mainWindow.container.Content = new TechnologicalProcessView();//获取控件
+ }
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
{
if (WorkOrder_Numder == null) return;
@@ -188,5 +211,7 @@ namespace DyeingComputer.View
}
}
}
+
+
}
}
diff --git a/Windows/ViewProgram.xaml b/Windows/ViewProgram.xaml
new file mode 100644
index 0000000..521f49f
--- /dev/null
+++ b/Windows/ViewProgram.xaml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Windows/ViewProgram.xaml.cs b/Windows/ViewProgram.xaml.cs
new file mode 100644
index 0000000..24156ad
--- /dev/null
+++ b/Windows/ViewProgram.xaml.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+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.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using static DyeingComputer.Windows.ViewStep;
+using System.Xml.Linq;
+using System.Windows.Media.Animation;
+using System.Net;
+using System.Data;
+using static DyeingComputer.UserClass.SqliteHelper;
+
+namespace DyeingComputer.Windows
+{
+ ///
+ /// ViewProgram.xaml 的交互逻辑
+ ///
+ public partial class ViewProgram : Window
+ {
+ public ViewProgram()
+ {
+ 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 order by ProgramID desc";
+
+ 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();
+ }
+ public delegate void AddressUpdateHandler(object sender, AddressUpdateEventArgs e);
+ //声明一个更新Address的事件
+ public event AddressUpdateHandler AddressUpdated;
+
+ private void YES_Click(object sender, RoutedEventArgs e)//确认
+ {
+ var args = new AddressUpdateEventArgs(Program_STEP, Program_ID,Program_STEP);
+ AddressUpdated(this, args);
+ this.Close(); //关闭窗口
+ }
+
+ private void NO_Click(object sender, RoutedEventArgs e)//关闭
+ {
+ this.Close(); //关闭窗口
+ }
+
+ string Program_ID;
+ string Program_NAME;
+ string Program_STEP;
+ private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件
+ {
+ int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
+ if (rownum != -1)//判断鼠标定位是否有效
+ {
+ Program_ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
+ Program_NAME = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
+ Program_STEP = (Grid.Columns[2].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
+ }
+ }
+
+ public class AddressUpdateEventArgs : System.EventArgs
+ {
+ public AddressUpdateEventArgs(string dStep, string dID, string dNAME)
+ {
+ this.ID = dID;
+ this.Step = dStep;
+ this.NAME = dNAME;
+ }
+
+ public string Step { get; set; }
+ public string ID { get; set; }
+ public string NAME { get; set; }
+
+ }
+ }
+}