Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

App.config

@@ -37,6 +37,58 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DotNetty.Transport" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DotNetty.Buffers" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DotNetty.Codecs.Http" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DotNetty.Common" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DotNetty.Codecs" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

App.xaml.cs

@@ -1,11 +1,5 @@
-using Svg;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
+using System;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace formula_manage
@@ -44,10 +38,6 @@ namespace formula_manage
             this.DispatcherUnhandledException += App_DispatcherUnhandledException;
         }
 
-        string Log_time = DateTime.Now.ToString("yyyy-MM-dd");       
-        string logpath = System.Environment.CurrentDirectory + "\\Log\\ERR";//日志文件目录
-        //string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件
-
         private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             e.Handled = true;
@@ -71,30 +61,44 @@ namespace formula_manage
                                 );
             }
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
+            string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
+            string logpath = System.Environment.CurrentDirectory + "\\ERR";//日志文件目录
+            //string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件
+            // System.IO.DirectoryInfo log = new System.IO.DirectoryInfo();//生成日志文件目录
             string log_path = logpath + "\\ERR" + Log_time + ".txt";
             string Log_timehms = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            if (!File.Exists(log_path))//检查日志文件并写入启动日志
+            if (Directory.Exists(logpath))//检查日志路径
             {
-                FileStream fs = new FileStream(log_path, FileMode.CreateNew, FileAccess.Write);//创建写入文件 
+                if (!File.Exists(log_path))//检查文件并写入
+                {
+                    FileStream fs = new FileStream(log_path, FileMode.CreateNew, FileAccess.Write);//创建文件 
                     StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
-                wr.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
-                wr.WriteLine("[" + Log_timehms + "];[Detailed] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
-                wr.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
                     wr.Close();
+                    FileStream fil = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件 
+                    StreamWriter wfil = new StreamWriter(fil);//创建文件
+                    wfil.WriteLine("[" + Log_timehms + "];[Error] ||" + Environment.NewLine.ToString());
+                    wfil.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
+                    wfil.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
+                    wfil.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
+                    wfil.Close();
                 }
                 else
                 {
                     FileStream fs = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件 
                     StreamWriter wr = new StreamWriter(fs);//创建文件
+                    wr.WriteLine("[" + Log_timehms + "];[Error] ||" + Environment.NewLine.ToString());
                     wr.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
                     wr.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
-                wr.WriteLine("[" + Log_timehms + "];[Detailed] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
                     wr.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
                     wr.Close();
                 }
             }
+            else
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
+                directoryInfo.Create();
+            }
+        }
 
         /// <summary>
         /// 启动初始页面

ConvertMoels/CategoriesSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

ConvertMoels/ColorSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

ConvertMoels/DeviationConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace Audit.ConvertMoels

ConvertMoels/GramsSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace Audit.ConvertMoels

ConvertMoels/IndustrySQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

ConvertMoels/IonSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

ConvertMoels/ProductTypeSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

ConvertMoels/StatenConvert.cs

@@ -1,12 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Controls;
 
 /// <summary>
 /// 运行状态变换器

ConvertMoels/StatenERRConvert.cs

@@ -1,12 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Controls;
 
 namespace Audit.ConvertMoels
 {

ConvertMoels/UserSQLConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels

EX/ExProgram.xaml.cs

@@ -1,17 +1,5 @@
 using formula_manage.UserClass;
-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
 {
@@ -23,7 +11,7 @@ namespace formula_manage.EX
         public ExProgram()
         {
             InitializeComponent();
-            Log.SetTextControl(textLog);
+            LogDataRead.SetTextControl(textLog);
         }
     }
 }

EX/Exchange.xaml.cs

@@ -1,20 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-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;
-using System.Windows.Threading;
 
 namespace formula_manage.EX
 {

Help.xaml.cs

@@ -1,16 +1,4 @@
-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;
+using System.Windows;
 
 namespace formula_manage
 {

IProvider.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace formula_manage
+namespace formula_manage
 {
     /// <summary>
     /// 查询接口

Login.xaml.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Runtime.InteropServices;
-using System.Data.SqlClient;
-using System.Data;
-using System.Security.Policy;
-using System.IO;
-using formula_manage.Windows;
 
 namespace formula_manage
 {
@@ -27,11 +14,6 @@ namespace formula_manage
     /// </summary>
     public partial class Login : Window
     {
-
-        string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
-        string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\Log.txt";//日志文件
-        string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
-
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
 
         DataTable logindataTable = new DataTable();   //建立login缓存
@@ -41,31 +23,14 @@ namespace formula_manage
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
-            if (!File.Exists(logPath))//检查日志文件并写入启动日志
-            {
-                FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件 
-                StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine(Log_time + "FORMULA_start");
-                wr.Close();
-            }
-            else
-            {
-                FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine(Log_time + "FORMULA_start");
-                wr.Close();
-            }
-
+            UserClass.LogGing.LogGingDATA("FORMULA_start");
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)  //退出按钮事件
         {
-            FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-            StreamWriter wr = new StreamWriter(fs);//创建文件
-            wr.WriteLine(Log_time + "FORMULA_LogStop");
-            wr.Close();
-            this.Close();
+            UserClass.LogGing.LogGingDATA("FORMULA_LogStop");
+            Window window = Window.GetWindow(this);
+            window.Close();
         }
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //登录按钮事件
@@ -87,10 +52,7 @@ namespace formula_manage
                 MainWindow Main = new MainWindow();
                 window.Close();
 
-                FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine(Log_time + "LOGon = ENGINEER");
-                wr.Close();
+                UserClass.LogGing.LogGingDATA("LOGon = ENGINEER");
 
                 Main.ShowDialog();//实例化并置顶打开窗口
             }
@@ -111,10 +73,7 @@ namespace formula_manage
                     MainWindow Main = new MainWindow();
                     window.Close();
 
-                    FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                    StreamWriter wr = new StreamWriter(fs);//创建文件
-                    wr.WriteLine(Log_time + "LOGon = " + user);
-                    wr.Close();
+                    UserClass.LogGing.LogGingDATA("LOGon = " + user);
 
                     Main.ShowDialog();//实例化并置顶打开窗口
                 }
@@ -162,14 +121,12 @@ namespace formula_manage
                 try
                 {
                     EXLINK.Background = Brushes.Green;
-                }catch(Exception) 
+                }
+                catch (Exception)
                 {
                     EXLINK.Background = Brushes.Red;
                     System.Windows.MessageBox.Show("扩展程序未启动");
-                    FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                    StreamWriter wr = new StreamWriter(fs);//创建文件
-                    wr.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "EX = FALL_TO_START");
-                    wr.Close();
+                    UserClass.LogGing.LogGingDATA("EX = FALL_TO_START");
                 }
             }
             try
@@ -180,7 +137,8 @@ namespace formula_manage
                 TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
                 TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
                 SQL2 = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6"));  //数据库对象2是否生效
-            }catch(Exception) 
+            }
+            catch (Exception)
             {
                 System.Windows.MessageBox.Show("配置信息丢失");
             }
@@ -199,7 +157,8 @@ namespace formula_manage
             try
             {
                 await conn_SC.OpenAsync();
-            }catch (Exception) 
+            }
+            catch (Exception)
             {
                 DISPENLINK.Background = Brushes.Red; //连接失败红色
                 DBCLINK.Background = Brushes.Red;
@@ -207,10 +166,7 @@ namespace formula_manage
                 //Windows.Sql sql = new Windows.Sql();
                 //sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
 
-                FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "DISPENLINK = ConnectFailed");
-                wr.Close();
+                UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
 
                 return;
             }
@@ -237,17 +193,15 @@ namespace formula_manage
                 try
                 {
                     await conn_DBC.OpenAsync();
-                }catch (Exception) 
+                }
+                catch (Exception)
                 {
                     DBCLINK.Background = Brushes.Red; //连接失败红色
                     System.Windows.MessageBox.Show("连接数据库失败");
                     //Windows.Sql sql = new Windows.Sql();
                     //sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
 
-                    FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                    StreamWriter wr = new StreamWriter(fs);//创建文件
-                    wr.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "DBCLINK = ConnectFailed");
-                    wr.Close();
+                    UserClass.LogGing.LogGingDATA("DBCLINK = ConnectFailed");
 
                     return;
                 }
@@ -275,10 +229,7 @@ namespace formula_manage
                 catch (Exception)
                 {
                     System.Windows.MessageBox.Show("请求信息失败，检查连接");
-                    FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-                    StreamWriter wr = new StreamWriter(fs);//创建文件
-                    wr.WriteLine("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "USER = NoData");
-                    wr.Close();
+                    UserClass.LogGing.LogGingDATA("USER = NoData");
                     return;
                 }
             }

MainWindow.xaml

@@ -24,7 +24,6 @@
                 <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="_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,9 +45,13 @@
             </MenuItem>
             <MenuItem Header="_查询" FontSize="16" Focusable ="False">
                 <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">
+                <MenuItem Header="_模式" FontSize="16"  Name="_WorkingMode" IsEnabled="False"/>
+                <MenuItem Header="_转换设置" FontSize="16" Name="_EX_SET" Click="EX_SET" IsEnabled="False"/>
+                <MenuItem Header="_转换历史" FontSize="16" Name="_exchange" Click="EXCHANGE" IsEnabled="False"/>
+            </MenuItem>
             <MenuItem Header="_帮助" FontSize="16" Focusable ="False">
                 <MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
             </MenuItem>

MainWindow.xaml.cs

@@ -1,41 +1,18 @@
-using formula_manage.Windows;
+using formula_manage.UserClass;
+using formula_manage.View;
+using formula_manage.ViewModel;
+using formula_manage.Windows;
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Globalization;
+using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using formula_manage.ViewModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using static System.Net.Mime.MediaTypeNames;
-using formula_manage.UserClass;
-using System.Drawing;
-using System.Diagnostics;
-using System.Printing;
-using System.Drawing.Printing;
-using static System.Drawing.Printing.PrinterSettings;
-using formula_manage.View;
-using formula_manage.EX;
 
 namespace formula_manage
 {
@@ -53,7 +30,9 @@ namespace formula_manage
         DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT缓存
         // DataTable RecipedataTable = new DataTable();   //建立Recipe缓存
 
-        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
+        private readonly string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
+        //调用配置文件
+        private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini");
 
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
@@ -62,7 +41,6 @@ namespace formula_manage
         string TEXT_SQLPASWOR;
         string Connstr_SC;
         int ID_N = 1;
-        string DYELOT_;
 
         string Tlist_Weight;
         string Tlist_Proportion;
@@ -75,7 +53,15 @@ namespace formula_manage
             InitializeComponent();
             this.Closing += Window_Closing;   //添加窗口关闭事件
 
+            if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
+            {
                 UserClass.TCPServer.Start();  //开启网路通讯
+                _WorkingMode.Header = "服务端";
+            }
+            else 
+            {
+                _WorkingMode.Header = "客户端";
+            }
 
             USER.Text = App.USER_Purview;
             RRODUCTdataTable.Columns.Add("ID", typeof(int));
@@ -128,7 +114,6 @@ namespace formula_manage
 
         private void PrintForms()//传入可用打印模板
         {
-            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             int dirID = 0;
 
             DataTable Report = new DataTable();
@@ -159,7 +144,6 @@ namespace formula_manage
 
         private 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");
@@ -198,6 +182,7 @@ namespace formula_manage
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("请求信息失败，检查连接");
+                UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
                 return;
             }
 
@@ -248,10 +233,6 @@ namespace formula_manage
         }
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
         {
-            string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
-            string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\Log.txt";//日志文件
-            string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
-
             if (!quit)
             {
                 MessageBoxResult result = System.Windows.MessageBox.Show("您确定要退出吗？", "SUNLIGHT", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
@@ -259,16 +240,17 @@ namespace formula_manage
                 if (result == MessageBoxResult.Cancel) //判断是否确认
                 {
                     e.Cancel = true; // 中断点击事件
+                    return;
                 }
             }
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
-            FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
-            StreamWriter wr = new StreamWriter(fs);//创建文件
-           // wr.WriteLine(Log_time + "HttpSERVER_STOP");
-           // UserClass.HttpSERVER.Stop();    //停止网络通信
-            wr.WriteLine(Log_time + "FORMULA_STOP");
-            wr.Close();
+            // UserClass.LogGing.LogGingDATA(Log_time + "HttpSERVER_STOP");
+            if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
+            {
+                UserClass.TCPServer.Btn_SendAll("SERVER_STOP");
+            }
+
+            UserClass.LogGing.LogGingDATA("FORMULA_STOP");
         }
         private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)  //回车跳转功能
         {
@@ -510,6 +492,7 @@ namespace formula_manage
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("数据访问失败，重试");
+                UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
                 return;
             }   //单号重复检查
             if (Machine.Text == "")

Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 

SQLModels/STUFF_Product.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.SQLModels
 {

UserClass/CRCcheck16.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {

UserClass/Code128.cs

@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {

UserClass/DataGridHelper.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace formula_manage.UserClass
 {

UserClass/DataTableForToObservableCollection.cs

@@ -1,15 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
-    internal class DataTableToObservableCollection
+    internal class DataTableToObservableCollection //数据表到可观察集合
     {
         public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new()
         {

UserClass/HardwareSN.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Management;
-using System.Text;
-using System.Threading.Tasks;
+using System.Management;
 
 namespace formula_manage.UserClass
 {

UserClass/IniFile.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {

UserClass/LogDataRead.cs

@@ -1,15 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Documents;
+using System.Text;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace formula_manage.UserClass
 {
-    public static class Log
+    public static class LogDataRead
     {
         private const int MaxCount = 1000;
         private static int Count = 0;

UserClass/LogGing.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+
+namespace formula_manage.UserClass
+{
+    public class LogGing
+    {
+        public static void LogGingDATA(string dat)
+        {
+            string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
+            string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt";//日志文件
+            string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
+
+            if (Directory.Exists(logpath))//检查日志路径
+            {
+                if (!File.Exists(logPath))//检查日志文件并写入启动日志
+                {
+                    FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件 
+                    StreamWriter wr = new StreamWriter(fs);//创建文件
+                    wr.WriteLine(Log_time + dat);
+                    wr.Close();
+                }
+                else
+                {
+                    FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
+                    StreamWriter wr = new StreamWriter(fs);//创建文件
+                    wr.WriteLine(Log_time + dat);
+                    wr.Close();                }
+            }
+            else
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
+                directoryInfo.Create();//创建日志路径
+            }
+        }
+    }
+}

UserClass/MD5check.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {

UserClass/PressKey.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace formula_manage.UserClass

UserClass/PrintHelper.cs

@@ -3,9 +3,6 @@ using FastReport.Data;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
@@ -84,7 +81,7 @@ namespace formula_manage.UserClass
                 string chineseSimpleFrl = AppDomain.CurrentDomain.BaseDirectory + @"FastReport\Localization\language.frl";
                 FastReport.Utils.Res.LoadLocale(chineseSimpleFrl);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
 

UserClass/StrToInt.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
@@ -31,7 +27,7 @@ namespace formula_manage.UserClass
                 //int r3 = Convert.ToInt32(str, 16);
                 //Console.WriteLine(r3);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 res = 0;
             }

UserClass/TCPServer.cs

@@ -1,28 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Windows.Forms;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
     public class TCPServer
     {
-
+        public static string infoR;
         //第一步：调用socket()函数创建一个用于通信的套接字
         public static Socket listenSocket;
 
         //字典集合：存储IP和Socket的集合
         public static Dictionary<string, Socket> OnLineList = new Dictionary<string, Socket>();
 
+       
        //当前时间
         private string CurrentTime
         {
@@ -30,39 +26,32 @@ namespace formula_manage.UserClass
         }
 
         //编码格式  
-            Encoding econding = Encoding.Default;
-
+        public static Encoding econding = Encoding.UTF8;
 
         public static void Start()
         {
             //第一步：调用socket()函数创建一个用于通信的套接字      
             listenSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-
             //第二步：给已经创建的套接字绑定一个端口号，这一般通过设置网络套接口地址和调用Bind()函数来实现
-                IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), int.Parse("11080"));
-
+            IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse(UserClass.get_local_ip_address.IP_Address()), int.Parse("11080"));
+            UserClass.LogGing.LogGingDATA("NativeIP = " + UserClass.get_local_ip_address.IP_Address());
+            UserClass.LogGing.LogGingDATA("NativePORT = 11080");
             try
             {
                 listenSocket.Bind(endPoint);
             }
             catch (Exception ex)
             {
-                    MessageBox.Show("服务器开启失败：" + ex.Message, "开启服务器");
+                UserClass.LogGing.LogGingDATA("TCP_NotStart");
+                UserClass.LogGing.LogGingDATA(ex.Message);
                 return;
             }
-
             //第三步：调用listen()函数使套接字成为一个监听套接字
             listenSocket.Listen(10);
-
             //ShowMessage("服务器开启成功");
 
             //开启一个线程监听
-                Task.Run(new Action(() =>
-                {
-                    ListenConnection();
-                }
-                ));
-
+            Task.Run(new Action(() => { ListenConnection(); }));
         }
 
         public static void ListenConnection()
@@ -70,23 +59,17 @@ namespace formula_manage.UserClass
             while (true)
             {
                 Socket clientSocket = listenSocket.Accept();
-
                 string ip = clientSocket.RemoteEndPoint.ToString();
-
                 //更新在线列表
                 //   AddOnLine(ip, true);
                 //更新在线列表集合  
                 OnLineList.Add(ip, clientSocket);
-
+                UserClass.LogGing.LogGingDATA("IP_Online = " + ip);
                 // ShowMessage(ip + "上线了");
-
                 Task.Run(() => ReceiveMsg(clientSocket));
-
             }
-
         }
 
-
         /// <summary>
         /// 接收方法
         /// </summary>
@@ -96,7 +79,7 @@ namespace formula_manage.UserClass
             while (true)
             {
                 //定义一个2M的缓冲区  
-                    byte[] buffer = new byte[1024 * 1024 * 2];
+                byte[] buffer = new byte[1024 * 1024 * 10];
 
                 int length = -1;
                 try
@@ -105,41 +88,34 @@ namespace formula_manage.UserClass
                 }
                 catch (Exception)
                 {
-
                     //客户端下线了
-
                     //更新在线列表
                     string ip = clientSocket.RemoteEndPoint.ToString();
-
+                    UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
                     //   AddOnLine(ip, false);
-
-                        OnLineList.Remove(ip);
-
-                        break;
+                    OnLineList.Remove(ip);  //移除ip
+                    break;   //退出循环
                 }
 
                 if (length == 0)
                 {
                     //客户端下线了
-
                     //更新在线列表          
                     string ip = clientSocket.RemoteEndPoint.ToString();
-
+                    UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
                     //    AddOnLine(ip, false);
-
                     OnLineList.Remove(ip);
-
                     break;
                 }
-
-
-                  //  if (length > 0)
-               //     {
-                //        string info = econding.GetString(buffer, 0, length);
+                else
+                {
+                    infoR = econding.GetString(buffer, 0, length);
                     //ShowMessage(info);
-              //      }
+                    string ip = clientSocket.RemoteEndPoint.ToString();
                 }
             }
+
+        }
         /*
                     /// <summary>
                     /// 在线列表更新
@@ -176,47 +152,32 @@ namespace formula_manage.UserClass
                         }));
 
                     }
+
         */
-/*
         /// <summary>
         /// 消息发送
         /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e"></param>
-            private void btn_Send_Click(object sender, EventArgs e)
+        public static void Bn_Send(string IP, string DAT)
         {
-                if (this.lst_Online.SelectedItem != null)
+            if (OnLineList.ContainsKey(IP))
             {
-                    foreach (string item in this.lst_Online.SelectedItems)
-                    {
-                        if (OnLineList.ContainsKey(item))
-                        {
-                            OnLineList[item].Send(econding.GetBytes(this.txt_Send.Text.Trim()));
+                OnLineList[IP].Send(econding.GetBytes(DAT));
             }
         }
-                }
-                else
-                {
-                    MessageBox.Show("请先选择要发送的对象", "发送消息");
-                }
-
-            }
 
         /// <summary>
         /// 群发功能
         /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e"></param>
-            private void btn_SendAll_Click(object sender, EventArgs e)
+        public static void Btn_SendAll(string DAT)
         {
-                foreach (string item in this.lst_Online.Items)
+            foreach (string item in OnLineList.Keys.ToArray())
             {
                 if (OnLineList.ContainsKey(item))
                 {
-                        OnLineList[item].Send(econding.GetBytes(this.txt_Send.Text.Trim()));
+                    OnLineList[item].Send(econding.GetBytes(DAT));
+                }
             }
         }
-            }*/
 
     }
 }

UserClass/UserPrint.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing.Printing;
-using System.Linq;
 using System.Management;
 using System.Printing;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace formula_manage.UserClass

UserClass/get_local_ip_address.cs

@@ -0,0 +1,46 @@
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
+
+namespace formula_manage.UserClass
+{
+    public class get_local_ip_address
+    {
+        public static string getLocalIPAddressWithNetworkInterface(NetworkInterfaceType _type)//获取本机ip并以字符串方式返回
+        {
+            string output = "";
+            foreach (NetworkInterface item in NetworkInterface.GetAllNetworkInterfaces())
+            {
+                if (item.NetworkInterfaceType == _type && item.OperationalStatus == OperationalStatus.Up)
+                {
+                    foreach (UnicastIPAddressInformation ip in item.GetIPProperties().UnicastAddresses)
+                    {
+                        if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
+                        {
+                            output = ip.Address.ToString();
+                        }
+                    }
+                }
+            }
+            return output;
+        }
+
+        public static string IP_Address()
+        {
+            string ip;
+
+            ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ethernet);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wireless80211);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ppp);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wwanpp);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.TokenRing);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Fddi);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.GenericModem);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.IPOverAtm);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Tunnel);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Unknown);
+
+            if (ip == "") ip = "127.0.0.1";
+            return ip;
+        }
+    }
+}

View/Formula.xaml.cs

@@ -1,17 +1,4 @@
-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.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace formula_manage.View
 {

View/ViewOrder.xaml.cs

@@ -1,21 +1,9 @@
 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.Data.SqlClient;
 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;
-using FastReport.Editor;
-using FastReport.DevComponents.DotNetBar;
 
 namespace formula_manage.View
 {

View/ViewProcess.xaml.cs

@@ -1,19 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-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
 {

ViewModel/ExchangeViewModel.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Threading;
 
 namespace formula_manage.ViewModel

ViewModel/MainWindowViewModel.cs

@@ -1,24 +1,11 @@
-using formula_manage.SQLModels;
-using formula_manage.UserClass;
-using formula_manage.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
+using formula_manage.UserClass;
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using System.Xml.Linq;
 
 namespace formula_manage.ViewModel
 {
@@ -43,8 +30,8 @@ namespace formula_manage.ViewModel
         DataTable DissolvedataTable = new DataTable();   //建立Dissolve
         DataTable STUFFdataTable = new DataTable();   //建立STUFF
         DataTable MACHINEdataTable = new DataTable();   //建立Machine
-        DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT
-        DataTable RecipedataTable = new DataTable();   //建立Recipe
+                                                        //  DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT
+                                                        //  DataTable RecipedataTable = new DataTable();   //建立Recipe
 
         public static DataTable STUFFdatatemp = new DataTable();   //建立STUFF缓存
         public static DataTable MACHINEdatatemp = new DataTable();   //建立Machine缓存
@@ -127,7 +114,8 @@ namespace formula_manage.ViewModel
                     {
                         Cdk_page = "Visible";
                         Cdk_time = "许可证安全校验错误请重新激活";
-                    }                          }
+                    }
+                }
                 else
 
                 {
@@ -182,7 +170,8 @@ namespace formula_manage.ViewModel
             }
             catch (Exception)
             {
-                System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
+                System.Windows.MessageBox.Show("请求信息失败");
+                UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
                 return;
             }
         }

ViewModel/RECIPEViewModel.cs

@@ -1,22 +1,9 @@
-using formula_manage.SQLModels;
-using formula_manage.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using System.Xml.Linq;
 
 namespace formula_manage.ViewModel
 {

ViewModel/ViewModelLocator.cs

@@ -1,10 +1,4 @@
 using CommonServiceLocator;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Ioc;
 
 namespace formula_manage.ViewModel

Windows/APP_set.xaml.cs

@@ -1,17 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-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.Windows
 {

Windows/CDKEY.xaml.cs

@@ -1,23 +1,6 @@
 using formula_manage.UserClass;
 using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Globalization;
-using System.Linq;
-using System.Management;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-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.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 
 namespace formula_manage.Windows
@@ -41,16 +24,34 @@ namespace formula_manage.Windows
         private void Window_CDKEY(object sender, RoutedEventArgs e)  //打开页面
         {
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
-            cdk.Text = Configini.IniReadvalue("SN", "SN1");    //读配置文件
+            string cdk = Configini.IniReadvalue("SN", "SN1");    //读配置文件
 
+            if (cdk.Length == 16)
+            {
+                if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Substring(0, 12)), true) == cdk.Substring(12, 4)) //校验key的crc校验值
+                {
                     try
                     {
-                string Y = (2255 - StrToInt.To16Convert10(cdk.Text.Substring(6, 2))).ToString();
-                string M = (255 - StrToInt.To16Convert10(cdk.Text.Substring(8, 2))).ToString();
-                string D = (255 - StrToInt.To16Convert10(cdk.Text.Substring(10, 2))).ToString();
+                        string Y = (2255 - StrToInt.To16Convert10(cdk.Substring(6, 2))).ToString();
+                        string M = (255 - StrToInt.To16Convert10(cdk.Substring(8, 2))).ToString();
+                        string D = (255 - StrToInt.To16Convert10(cdk.Substring(10, 2))).ToString();
                         sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
                     }
-            catch (Exception ex) { }
+                    catch (Exception)
+                    {
+                        sn_time.Text = "注册有效时间: --------";
+                    }
+                }
+                else
+                {
+                    sn_time.Text = "注册有效时间: --------";
+                }
+            }
+            else
+            {
+                sn_time.Text = "注册有效时间: --------";
+            }
+
             // 获取CPU序列号
             cpuSerialNumber = HardwareSN.GetCPUSerialNumber();
             // 获取主板序列号
@@ -68,7 +69,13 @@ namespace formula_manage.Windows
             string id_1;
             id_1 = sn_id.Text.Substring(5, 1) + sn_id.Text.Substring(0, 1) + sn_id.Text.Substring(4, 1) + sn_id.Text.Substring(1, 1) + sn_id.Text.Substring(3, 1) + sn_id.Text.Substring(2, 1);
 
-            if ((id_1 == cdk.Text.Substring(0, 6)) && (cdk.Text.Length == 16))
+            if (cdk.Text.Length != 16)
+            {
+                System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (id_1 == cdk.Text.Substring(0, 6))
             {
                 if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Text.Substring(0, 12)), true) == cdk.Text.Substring(12, 4)) //校验key的crc校验值
                 {

Windows/Dissolve.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {

Windows/Machine.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {

Windows/Print.xaml

@@ -36,7 +36,7 @@
         <Button Content="预览模板" HorizontalAlignment="Left" Height="20" Margin="375,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_22"/>
         <Button Content="编辑模板" HorizontalAlignment="Left" Height="20" Margin="295,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_12"/>
         <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,305,0,0" TextWrapping="Wrap" Text="管理打印模板:" VerticalAlignment="Top" Width="90"/>
-        <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,305,0,0" VerticalAlignment="Top" Width="180" x:Name="Template" IsEditable="True"/>
+        <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,305,0,0" VerticalAlignment="Top" Width="180" x:Name="PrintTemplate" IsEditable="True"/>
         <Button Content="删除模板" HorizontalAlignment="Left" Height="20" Margin="375,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_4"/>
         <Button Content="添加模板" HorizontalAlignment="Left" Height="20" Margin="295,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_3"/>
         

Windows/Print.xaml.cs

@@ -1,30 +1,12 @@
-using System;
-using System.Collections.Generic;
-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.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using ThoughtWorks.QRCode.Codec;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Drawing.Printing;
+using FastReport;
 using formula_manage.UserClass;
-using System.Xml.Linq;
-using FastReport.Format;
-using Svg;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Printing;
 using System.IO;
-using System.Windows.Media.Media3D;
-using System.Reflection;
-using FastReport;
+using System.Windows;
+using System.Windows.Forms;
+using System.Xml.Linq;
 
 namespace formula_manage.Windows
 {
@@ -52,8 +34,7 @@ namespace formula_manage.Windows
         bool Printer;
         bool Printer2;
         bool Printer3;
-        bool Printer4;
-        bool Printer5;
+
 
         string Temp_M, Temp_S;
         private void Window_Print(object sender, RoutedEventArgs e)
@@ -97,8 +78,8 @@ namespace formula_manage.Windows
             Template_M.Text = Temp_M;//传入保存的默认模板
             Template_S.Text = Temp_S;//
 
-            Template.ItemsSource = files_M;
-            Template.DisplayMemberPath = "Name";
+            PrintTemplate.ItemsSource = files_M;
+            PrintTemplate.DisplayMemberPath = "Name";
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
@@ -228,7 +209,7 @@ namespace formula_manage.Windows
                         list.Add(xePrintName);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }
@@ -240,7 +221,7 @@ namespace formula_manage.Windows
 
             Prompt.Visibility = Visibility.Visible;  //开启页面遮罩
 
-            string Template_path = Print_path.Text + "/" + Template.Text;
+            string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
             string Template_DATA = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<Report ScriptLanguage=\"CSharp\" ReportInfo.Created=\"12/12/2023 23:59:59\" ReportInfo.Modified=\"12/12/2023 23:59:59\" ReportInfo.CreatorVersion=\"2023.12.12.0\">\r\n  <Dictionary/>\r\n  <ReportPage Name=\"Page1\" Watermark.Font=\"宋体, 60pt\">\r\n    <ReportTitleBand Name=\"ReportTitle1\" Width=\"718.2\" Height=\"37.8\"/>\r\n    <PageHeaderBand Name=\"PageHeader1\" Top=\"41.8\" Width=\"718.2\" Height=\"28.35\"/>\r\n    <DataBand Name=\"Data1\" Top=\"74.15\" Width=\"718.2\" Height=\"75.6\"/>\r\n    <PageFooterBand Name=\"PageFooter1\" Top=\"153.75\" Width=\"718.2\" Height=\"18.9\"/>\r\n  </ReportPage>\r\n</Report>";
 
             if (File.Exists(Template_path)) //判断文件是否存在
@@ -249,7 +230,7 @@ namespace formula_manage.Windows
                 Prompt.Visibility = Visibility.Hidden;//去页面遮罩
                 return;
             }
-            if (string.IsNullOrEmpty(Template.Text))
+            if (string.IsNullOrEmpty(PrintTemplate.Text))
             {
                 System.Windows.MessageBox.Show("模板名不能为空");
                 Prompt.Visibility = Visibility.Hidden;//去页面遮罩
@@ -266,7 +247,7 @@ namespace formula_manage.Windows
             }
 
             PRINT_file(); ;//刷新模板列表
-            Template.Text = null;//清空输入
+            PrintTemplate.Text = null;//清空输入
 
             Prompt.Visibility = Visibility.Hidden;//去页面遮罩
         }
@@ -275,7 +256,7 @@ namespace formula_manage.Windows
         {
             try
             {
-                string Template_path = Print_path.Text + "/" + Template.Text;
+                string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
                 File.Delete(Template_path);
             }
             catch
@@ -283,11 +264,11 @@ namespace formula_manage.Windows
                 System.Windows.MessageBox.Show("删除失败");
             }
 
-            Template.Text = null;
+            PrintTemplate.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"; // 显示文件名
+            PrintTemplate.ItemsSource = files_M;//加载合集
+            PrintTemplate.DisplayMemberPath = "Name"; // 显示文件名
         }
     }
 }

Windows/RECIPE.xaml.cs

@@ -1,41 +1,14 @@
-using formula_manage.Windows;
+using formula_manage.UserClass;
+using formula_manage.ViewModel;
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using formula_manage.ViewModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using static System.Net.Mime.MediaTypeNames;
-using formula_manage.UserClass;
-using System.Drawing;
-using System.Diagnostics;
-using System.Printing;
-using System.Drawing.Printing;
-using static System.Drawing.Printing.PrinterSettings;
-using formula_manage.View;
-using FastReport.DevComponents.AdvTree;
 
 namespace formula_manage.Windows
 {
@@ -160,7 +133,7 @@ namespace formula_manage.Windows
             e.Handled = !re.IsMatch(e.Text);
         }
 
-        private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
+        private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
         {
             Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
             Regex re_char = new Regex(@"^[A-Za-z0-9\s@（)()/+!！_-]+$");//校验用正则表达式由数字,26个英文字母，空白字符和@（)()/+!！_-组成的字符串         

Windows/SQL_BAK.xaml.cs

@@ -1,18 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Data.SqlClient;
-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.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 
 

Windows/Sql.xaml.cs

@@ -1,21 +1,6 @@
 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;
 using System.Data.SqlClient;
-using System.Net.NetworkInformation;
-using System.Runtime.InteropServices;
-using System.ComponentModel;
-using System.Data.SqlTypes;
+using System.Windows;
 
 
 namespace formula_manage.Windows

Windows/Stuff.xaml.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {

Windows/User.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {

Windows/client.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {
@@ -32,7 +17,6 @@ namespace formula_manage.Windows
 
         DataTable dataTable = new DataTable();   //建立缓存
 
-        int Button_ID = 0;
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;

Windows/color.xaml.cs

@@ -1,25 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {
@@ -32,7 +18,6 @@ namespace formula_manage.Windows
 
         DataTable dataTable = new DataTable();   //建立缓存
 
-        int Button_ID = 0;
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;

Windows/fabric.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-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;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {
@@ -32,7 +17,6 @@ namespace formula_manage.Windows
 
         DataTable dataTable = new DataTable();   //建立缓存
 
-        int Button_ID = 0;
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;

formula_manage.csproj

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props" Condition="Exists('packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props')" />
-  <Import Project="packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props" Condition="Exists('packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -116,256 +114,21 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bouyei.NetFactory, Version=21.5.1.42839, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bouyei.NetFactory.21.5.1.2\lib\Bouyei.NetFactory.dll</HintPath>
-    </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.7.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>packages\CommonServiceLocator.2.0.7\lib\net47\CommonServiceLocator.dll</HintPath>
-    </Reference>
-    <Reference Include="CommunityToolkit.Mvvm, Version=8.2.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
-      <HintPath>packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Buffers, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Buffers.0.6.0\lib\net45\DotNetty.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Codecs, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Codecs.0.6.0\lib\net45\DotNetty.Codecs.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Codecs.Http, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Codecs.Http.0.6.0\lib\net45\DotNetty.Codecs.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Common, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Common.0.6.0\lib\net45\DotNetty.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Handlers, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Handlers.0.6.0\lib\net45\DotNetty.Handlers.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Transport, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Transport.0.6.0\lib\net45\DotNetty.Transport.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNettySocket, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNettySocket.1.2.0\lib\net45\DotNettySocket.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Bars, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Bars.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Compat, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Compat.2024.2.2\lib\net462\FastReport.Compat.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.DataVisualization, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.DataVisualization.2024.2.2\lib\net462\FastReport.DataVisualization.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Editor, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.VSDesign, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.VSDesign.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Web, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="FirstFloor.ModernUI, Version=1.0.9.0, Culture=neutral, PublicKeyToken=bc9b0c37bf06c6a9, processorArchitecture=MSIL">
-      <HintPath>packages\ModernUI.WPF.1.0.9\lib\net45\FirstFloor.ModernUI.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ModernUI.Xceed.AvalonDock, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="ModernUI.Xceed.Toolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.Toolkit.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
-    </Reference>
-    <Reference Include="Smart.FormDesigner, Version=1.4.8302.26895, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Smart.FormDesigner.1.4.3\lib\net40\Smart.FormDesigner.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
     <Reference Include="System.Printing" />
-    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -374,32 +137,9 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -430,10 +170,12 @@
     <Compile Include="UserClass\Code128.cs" />
     <Compile Include="UserClass\CRCcheck16.cs" />
     <Compile Include="UserClass\DataGridHelper.cs" />
+    <Compile Include="UserClass\get_local_ip_address.cs" />
     <Compile Include="UserClass\HardwareSN.cs" />
+    <Compile Include="UserClass\LogGing.cs" />
     <Compile Include="UserClass\TCPServer.cs" />
     <Compile Include="UserClass\IniFile.cs" />
-    <Compile Include="UserClass\Log.cs" />
+    <Compile Include="UserClass\LogDataRead.cs" />
     <Compile Include="UserClass\MD5check.cs" />
     <Compile Include="UserClass\PressKey.cs" />
     <Compile Include="UserClass\DataTableForToObservableCollection.cs" />
@@ -636,7 +378,6 @@
     <None Include="FastReport\Localization\Turkish.frl" />
     <None Include="FastReport\Localization\Ukrainian.frl" />
     <None Include="formula_manage_TemporaryKey.pfx" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -678,14 +419,127 @@
   <ItemGroup>
     <Resource Include="FastReport\Localization\readme.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommonServiceLocator">
+      <Version>2.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Mvvm">
+      <Version>8.2.2</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Buffers">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Codecs">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Codecs.Http">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Common">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Handlers">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetty.Transport">
+      <Version>0.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="DotNettySocket">
+      <Version>1.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="Extended.Wpf.Toolkit">
+      <Version>4.6.0</Version>
+    </PackageReference>
+    <PackageReference Include="FastReport.Compat">
+      <Version>2024.2.11</Version>
+    </PackageReference>
+    <PackageReference Include="FastReport.DataVisualization">
+      <Version>2024.2.11</Version>
+    </PackageReference>
+    <PackageReference Include="FastReport.Net.Demo">
+      <Version>2024.2.11</Version>
+    </PackageReference>
+    <PackageReference Include="FastReport.OpenSource">
+      <Version>2024.2.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
+      <Version>8.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CSharp">
+      <Version>4.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
+      <Version>8.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <Version>8.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging">
+      <Version>8.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
+      <Version>8.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Options">
+      <Version>8.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Primitives">
+      <Version>8.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="ModernUI.WPF">
+      <Version>1.0.9</Version>
+    </PackageReference>
+    <PackageReference Include="MvvmLightLibs">
+      <Version>5.4.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="NModbus">
+      <Version>3.0.81</Version>
+    </PackageReference>
+    <PackageReference Include="Prism.Core">
+      <Version>8.1.97</Version>
+    </PackageReference>
+    <PackageReference Include="Prism.Forms">
+      <Version>8.1.97</Version>
+    </PackageReference>
+    <PackageReference Include="SamOatesGames.ModernUI.Xceed.Toolkit">
+      <Version>1.0.1905191936</Version>
+    </PackageReference>
+    <PackageReference Include="System.Buffers">
+      <Version>4.5.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>8.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource">
+      <Version>8.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Memory">
+      <Version>4.5.5</Version>
+    </PackageReference>
+    <PackageReference Include="System.Numerics.Vectors">
+      <Version>4.5.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.5.4</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.5.0</Version>
+    </PackageReference>
+    <PackageReference Include="ThoughtWorks.QRCode">
+      <Version>1.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms">
+      <Version>5.0.0.2662</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props'))" />
-    <Error Condition="!Exists('packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props'))" />
-    <Error Condition="!Exists('packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets'))" />
-  </Target>
-  <Import Project="packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets" Condition="Exists('packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" />
 </Project>

packages.config

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Bouyei.NetFactory" version="21.5.1.2" targetFramework="net472" />
-  <package id="CommonServiceLocator" version="2.0.7" targetFramework="net472" />
-  <package id="CommunityToolkit.Mvvm" version="8.2.2" targetFramework="net472" />
-  <package id="DotNetty.Buffers" version="0.6.0" targetFramework="net472" />
-  <package id="DotNetty.Codecs" version="0.6.0" targetFramework="net472" />
-  <package id="DotNetty.Codecs.Http" version="0.6.0" targetFramework="net472" />
-  <package id="DotNetty.Common" version="0.6.0" targetFramework="net472" />
-  <package id="DotNetty.Handlers" version="0.6.0" targetFramework="net472" />
-  <package id="DotNetty.Transport" version="0.6.0" targetFramework="net472" />
-  <package id="DotNettySocket" version="1.2.0" targetFramework="net472" />
-  <package id="Extended.Wpf.Toolkit" version="4.6.0" targetFramework="net472" />
-  <package id="FastReport.Compat" version="2024.2.2" targetFramework="net472" />
-  <package id="FastReport.DataVisualization" version="2024.2.2" targetFramework="net472" />
-  <package id="FastReport.Net.Demo" version="2024.2.2" targetFramework="net472" />
-  <package id="FastReport.OpenSource" version="2024.2.1" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging" version="1.1.1" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" targetFramework="net472" />
-  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
-  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="ModernUI.WPF" version="1.0.9" targetFramework="net46" />
-  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net46" />
-  <package id="NETStandard.Library" version="1.6.1" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
-  <package id="NModbus" version="3.0.81" targetFramework="net462" />
-  <package id="SamOatesGames.ModernUI.Xceed.Toolkit" version="1.0.1905191936" targetFramework="net46" />
-  <package id="Smart.FormDesigner" version="1.4.3" targetFramework="net462" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net472" />
-  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="net472" />
-  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
-  <package id="System.Console" version="4.3.0" targetFramework="net472" />
-  <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net462" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net472" />
-  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net472" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net472" />
-  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net472" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
-  <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
-</packages>