Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

MainWindow.xaml

@@ -68,7 +68,7 @@
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,175,0,0" TextWrapping="Wrap" Text="类型:" VerticalAlignment="Top" Width="90" FontSize="20"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,140,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
-        <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True" Grid.Column="1"/>
+        <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20"/>
         <TextBox x:Name="Number" HorizontalAlignment="Left" ToolTip="当前配方的物料单" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
         <TextBox x:Name="order" HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <TextBox x:Name="ReDye" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 

MainWindow.xaml.cs

@@ -110,6 +110,7 @@ namespace formula_manage
             }
 
             sql_();
+            PrintForms();
             Permissions_(); //权限管理
 
             DataRow row = RRODUCTdataTable.NewRow();  //ID列
@@ -121,6 +122,22 @@ namespace formula_manage
             Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
         }
 
+        private void PrintForms()
+        {
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+
+            string Print_path = Configini.IniReadvalue("PRINTER", "P3");
+            string Print_path2 = Configini.IniReadvalue("PRINTER", "P12");
+            string Temp_m = Configini.IniReadvalue("PRINTER", "P13");
+            string Temp_s = Configini.IniReadvalue("PRINTER", "P14");
+
+            DirectoryInfo di = new DirectoryInfo(Print_path); //new文件夹
+            FileInfo[] files = di.GetFiles();//生成文件夹中的文件名合集
+            Forms_.ItemsSource = files;//加载合集
+            Forms_.DisplayMemberPath = "Name"; // 显示文件名
+            Forms_.Text = Temp_m;
+        }
+
             private void sql_()
         {
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
@@ -283,7 +300,6 @@ namespace formula_manage
             ReDye.Text += "";
             Technology.Text = "";
             Machine.Text = "";
-            Forms_.Text = "";
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";
             Workflow.Text = "";