添加转换日志查询

App.xaml.cs

@@ -44,7 +44,7 @@ namespace formula_manage
             this.DispatcherUnhandledException += App_DispatcherUnhandledException;
         }
 
-        string Log_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
         string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
         //string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件
 

EX/ExProgram.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.EX"
         mc:Ignorable="d"
-        Title="ExProgram" Height="450" Width="800" Background="#FFE0E0E0">
+        Title="ExProgram" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0">
     <Grid>
 
 

EX/Exchange.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="formula_manage.EX.Exchange"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:formula_manage.EX"
+        mc:Ignorable="d"
+        Title="Exchange" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0">
+    <Grid>
+        <RichTextBox x:Name="Log" Margin="0,0,0,200" IsReadOnly="True" VerticalScrollBarVisibility="Visible" Background="White">
+            <FlowDocument>
+                <Paragraph>
+                    <Run Text="LOG"/>
+                </Paragraph>
+            </FlowDocument>
+        </RichTextBox>
+
+        
+        
+        <DatePicker HorizontalAlignment="Left" Height="30" Margin="50,0,0,50" VerticalAlignment="Bottom" Width="250"/>
+
+
+    </Grid>
+</Window>

EX/Exchange.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+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.Shapes;
+
+namespace formula_manage.EX
+{
+    /// <summary>
+    /// Exchange.xaml 的交互逻辑
+    /// </summary>
+    public partial class Exchange : Window
+    {
+        public Exchange()
+        {
+            InitializeComponent();
+        }
+    }
+}

MainWindow.xaml

@@ -24,7 +24,7 @@
                 <MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/>
                 <Separator/>
                 <MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
-                <MenuItem Header="_转换设置" FontSize="16" Name="_EXCHANGE_SET" IsEnabled="False"/>
+                <MenuItem Header="_转换设置" FontSize="16" Name="_EX_SET" Click="EX_SET" IsEnabled="False"/>
                 <MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/>
                 <MenuItem Header="_登录限制" FontSize="16" Name="_USER_log" IsEnabled="False"/>
             </MenuItem>
@@ -46,7 +46,7 @@
             </MenuItem>
             <MenuItem Header="_查询" FontSize="16" Focusable ="False">
                 <MenuItem Header="_领料单据" FontSize="16"/>
-                <MenuItem Header="_转换历史" FontSize="16"/>
+                <MenuItem Header="_转换历史" FontSize="16" Name="_exchange" Click="EXCHANGE" IsEnabled="False"/>
                 <MenuItem Header="_统计" FontSize="16" Name="_statistics" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_帮助" FontSize="16" Focusable ="False">

MainWindow.xaml.cs

@@ -35,6 +35,7 @@ using System.Printing;
 using System.Drawing.Printing;
 using static System.Drawing.Printing.PrinterSettings;
 using formula_manage.View;
+using formula_manage.EX;
 
 namespace formula_manage
 {
@@ -93,7 +94,7 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
-                _EXCHANGE_SET.IsEnabled = true;
+                _EX_SET.IsEnabled = true;
                 _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
                 _USER_log.IsEnabled = true;
@@ -107,6 +108,7 @@ namespace formula_manage
                 _client.IsEnabled = true;
                 _color.IsEnabled = true;
                 _statistics.IsEnabled = true;
+                _exchange.IsEnabled = true;
             }
 
             sql_();
@@ -207,7 +209,7 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
-                _EXCHANGE_SET.IsEnabled = true;
+                _EX_SET.IsEnabled = true;
                 _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
                 _RECIPE.IsEnabled = true;
@@ -220,6 +222,7 @@ namespace formula_manage
                 _client.IsEnabled = true;
                 _color.IsEnabled = true;
                 _statistics.IsEnabled = true;
+                _exchange.IsEnabled = true;
             }
             else
             {
@@ -237,6 +240,7 @@ namespace formula_manage
                     _client.IsEnabled = true;
                     _color.IsEnabled = true;
                     _statistics.IsEnabled = true;
+                    _exchange.IsEnabled = true;
                 }
             }
         }
@@ -381,10 +385,15 @@ namespace formula_manage
             Windows.User user_set = new Windows.User();
             user_set.ShowDialog();//实例化并置顶打开用户窗口   
         }
-        private void PRINT_SET(object sender, RoutedEventArgs e)
+        private void EX_SET(object sender, RoutedEventArgs e)//扩展程序
+        {
+            EX.ExProgram ex = new EX.ExProgram();
+            ex.ShowDialog();
+        }
+        private void PRINT_SET(object sender, RoutedEventArgs e)//打印设置
         {
             Windows.Print print = new Windows.Print();
-            print.ShowDialog();//实例化并置顶打开打印窗口
+            print.ShowDialog();
         }
         private void HELP(object sender, RoutedEventArgs e)
         {
@@ -419,6 +428,14 @@ namespace formula_manage
             Windows.Dissolve dissolve = new Windows.Dissolve();
             dissolve.ShowDialog();//实例化并置顶打开设置窗口   
         }
+        private void EXCHANGE(object sender, RoutedEventArgs e)//交换日志
+        {
+            EX.Exchange exchange = new EX.Exchange();
+            exchange.ShowDialog();
+        }
+
+
+
         private void print(object sender, RoutedEventArgs e)
         {
             Print.IsEnabled = false;
@@ -1034,6 +1051,5 @@ namespace formula_manage
             Save.IsEnabled = false;
             Confirm.IsEnabled = false;
         }
-
     }
 }

formula_manage.csproj

@@ -248,6 +248,9 @@
     <Compile Include="ConvertMoels\StatenConvert.cs" />
     <Compile Include="ConvertMoels\StatenERRConvert.cs" />
     <Compile Include="ConvertMoels\UserSQLConvert.cs" />
+    <Compile Include="EX\Exchange.xaml.cs">
+      <DependentUpon>Exchange.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EX\ExProgram.xaml.cs">
       <DependentUpon>ExProgram.xaml</DependentUpon>
     </Compile>
@@ -319,6 +322,10 @@
     <Compile Include="Windows\Stuff.xaml.cs">
       <DependentUpon>Stuff.xaml</DependentUpon>
     </Compile>
+    <Page Include="EX\Exchange.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="EX\ExProgram.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>