diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index aafbf94..9d9d9f6 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -86,7 +86,7 @@ namespace formula_manage
RRODUCTdataTable.Columns.Add("TARGET_WT", typeof(float));
RRODUCTdataTable.Columns.Add("UNIT", typeof(string));
RRODUCTdataTable.Columns.Add("Process", typeof(string));
- RRODUCTdataTable.Columns.Add("REMARK", typeof(string));
+ RRODUCTdataTable.Columns.Add("REMARK", typeof(string));
if (USER.Text == "ENGINEER") //工程师允许功能
{
@@ -122,9 +122,13 @@ namespace formula_manage
Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
}
- private void PrintForms()
+ private void PrintForms()//传入可用打印模板
{
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+ int dirID=0;
+
+ DataTable Report = new DataTable();
+ Report.Columns.Add("NAME", typeof(string));
string Print_path = Configini.IniReadvalue("PRINTER", "P3");
string Print_path2 = Configini.IniReadvalue("PRINTER", "P12");
@@ -132,9 +136,20 @@ namespace formula_manage
string Temp_s = Configini.IniReadvalue("PRINTER", "P14");
DirectoryInfo di = new DirectoryInfo(Print_path); //new文件夹
- FileInfo[] files = di.GetFiles();//生成文件夹中的文件名合集
- Forms_.ItemsSource = files;//加载合集
- Forms_.DisplayMemberPath = "Name"; // 显示文件名
+ FileInfo[] files = di.GetFiles("*.frx");//生成文件夹中的文件名合集
+
+ foreach (FileInfo file in files)
+ {
+ DataRow reportDATA = Report.NewRow();//插件新行
+ Report.Rows.Add(reportDATA);//保存修改
+ reportDATA = Report.Rows[dirID++];//选择行
+ reportDATA.BeginEdit();//开始编辑
+ reportDATA["NAME"] = System.IO.Path.GetFileNameWithoutExtension(file.Name);//传入字符
+ reportDATA.EndEdit();//结束编辑
+ }
+
+ Forms_.ItemsSource = Report.DefaultView;//加载合集
+ Forms_.DisplayMemberPath = "NAME"; // 显示文件名
Forms_.Text = Temp_m;
}
@@ -225,7 +240,6 @@ namespace formula_manage
}
}
}
-
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件
{
string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
@@ -392,11 +406,9 @@ namespace formula_manage
Windows.RECIPE rECIPE = new Windows.RECIPE();
rECIPE.ShowDialog();//实例化并置顶打开设置窗口
}
-
private void PROCESS(object sender, RoutedEventArgs e)
{
}
-
private void WORKFLOW(object sender, RoutedEventArgs e)
{
Windows.Dissolve dissolve = new Windows.Dissolve();
@@ -407,7 +419,6 @@ namespace formula_manage
Windows.Dissolve dissolve = new Windows.Dissolve();
dissolve.ShowDialog();//实例化并置顶打开设置窗口
}
-
private void print(object sender, RoutedEventArgs e)
{
Print.IsEnabled = false;
@@ -425,19 +436,16 @@ namespace formula_manage
Print.IsEnabled = true;
}
-
private void fabric(object sender, RoutedEventArgs e)
{
fabric fabric_page = new fabric();
fabric_page.ShowDialog();//实例化并置顶打开窗口
}
-
private void color(object sender, RoutedEventArgs e)
{
color color_page = new color();
color_page.ShowDialog();//实例化并置顶打开窗口
}
-
private void client(object sender, RoutedEventArgs e)
{
client client_page = new client();
@@ -447,12 +455,10 @@ namespace formula_manage
{
Confirm.IsEnabled = false;
}
-
private void delete(object sender, RoutedEventArgs e)
{
Delete.IsEnabled = false;
}
-
private async void save(object sender, RoutedEventArgs e) //保存按钮
{
@@ -558,12 +564,10 @@ namespace formula_manage
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); //记录当前单序号
Configini.IniWritevalue("SOFTWARE_SET", " T3", str_Prepose);
}
-
private void Button_NewOrder(object sender, RoutedEventArgs e) //新料单按钮
{
Number_Event();
}
-
private void Machine_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //机台回车跳转功能
{
if (e.Key == Key.Enter)
diff --git a/Windows/Print.xaml b/Windows/Print.xaml
index 995afb8..a460029 100644
--- a/Windows/Print.xaml
+++ b/Windows/Print.xaml
@@ -37,7 +37,7 @@
-
-
+
+
diff --git a/Windows/Print.xaml.cs b/Windows/Print.xaml.cs
index fc2437e..df80f6b 100644
--- a/Windows/Print.xaml.cs
+++ b/Windows/Print.xaml.cs
@@ -81,11 +81,11 @@ namespace formula_manage.Windows
cbxPrinter3.IsEnabled = Printer3;
DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹
- FileInfo[] files_M = di_M.GetFiles();//生成文件夹中的文件名合集
+ FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集
Template_M.ItemsSource = files_M;//加载合集
Template_M.DisplayMemberPath = "Name"; // 显示文件名
DirectoryInfo di_S = new DirectoryInfo(Print_path2.Text);
- FileInfo[] files_S = di_M.GetFiles();
+ FileInfo[] files_S = di_S.GetFiles("*.frx");
Template_S.ItemsSource = files_S;
Template_S.DisplayMemberPath = "Name";
Template_M.Text = Temp_M;//传入保存的默认模板
@@ -229,14 +229,47 @@ namespace formula_manage.Windows
return list;
}
- private void Button_Click_3(object sender, RoutedEventArgs e)
+ private void Button_Click_3(object sender, RoutedEventArgs e)//新建模板文件
{
+ string Template_path = Print_path.Text + "/" + Template.Text;
+ string Template_DATA = "\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n";
+ if (File.Exists(Template_path)) //判断文件是否存在
+ {
+ System.Windows.MessageBox.Show("模板已存在");
+ return;
+ }
+ if (string.IsNullOrEmpty(Template.Text))
+ {
+ System.Windows.MessageBox.Show("模板名不能为空");
+ return;
+ }
+
+ File.WriteAllText(Template_path + ".frx", Template_DATA);
+ var tuple = PrintHelper.Design(Template_path + ".frx");
+ if (!tuple.Item1)
+ {
+ System.Windows.MessageBox.Show($"打开设计器失败：{tuple.Item2}");
+ }
}
- private void Button_Click_4(object sender, RoutedEventArgs e)
+ private void Button_Click_4(object sender, RoutedEventArgs e)//删除指定模板
{
+ try
+ {
+ string Template_path = Print_path.Text + "/" + Template.Text;
+ File.Delete(Template_path);
+ }
+ catch
+ {
+ System.Windows.MessageBox.Show("删除失败");
+ }
+ Template.Text = null;
+ DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹
+ FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集
+ Template.ItemsSource = files_M;//加载合集
+ Template.DisplayMemberPath = "Name"; // 显示文件名
}
}
}
diff --git a/formula_manage.csproj b/formula_manage.csproj
index 4dcde24..8b0fef6 100644
--- a/formula_manage.csproj
+++ b/formula_manage.csproj
@@ -428,6 +428,8 @@
ResXFileCodeGenerator
Resources.Designer.cs
+
+