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

App.xaml.cs

@@ -1,11 +1,5 @@
-using Svg;
+using System;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
 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;
@@ -56,8 +46,8 @@ namespace formula_manage
                 MessageBox.Show("发生了一个无法处理的错误！请联系SUNLIGHT处理！"
                     + "(1)错误" + Environment.NewLine
                     + "(2)错误源：" + e.Exception.Source + Environment.NewLine
-                    //  + (3)详细信息：" + e.Exception.Message + Environment.NewLine                             
+                                //  + (3)详细信息：" + e.Exception.Message + Environment.NewLine                             
-                    //  + "(4)报错区域：" + e.Exception.StackTrace
+                                //  + "(4)报错区域：" + e.Exception.StackTrace
                                 );
             }
             else
@@ -71,28 +61,42 @@ namespace formula_manage
                                 );
             }
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
+            string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
-            string log_path = logpath +"\\ERR" +Log_time + ".txt";
+            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))//检查文件并写入
-                StreamWriter wr = new StreamWriter(fs);//创建文件
+                {
-                wr.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
+                    FileStream fs = new FileStream(log_path, FileMode.CreateNew, FileAccess.Write);//创建文件 
-                wr.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
+                    StreamWriter wr = new StreamWriter(fs);//创建文件
-                wr.WriteLine("[" + Log_timehms + "];[Detailed] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
+                    wr.Close();
-                wr.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
+                    FileStream fil = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件 
-                wr.Close();
+                    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 + "];[Error area] ||" + e.Exception.StackTrace.ToString());
+                    wr.Close();
+                }
             }
             else
             {
-                FileStream fs = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件 
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
-                StreamWriter wr = new StreamWriter(fs);//创建文件
+                directoryInfo.Create();
-                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();
             }
         }
 

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,14 +1,10 @@
 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
 {
-   /// <summary>
+    /// <summary>
     /// RGB色彩数值转换器
     /// 将色彩数值转换为ARGB代码返回
     /// </summary>
@@ -33,8 +29,8 @@ namespace formula_manage.ConvertMoels
                 return null;//返回空
             }
         }
-    /// <summary> 
+        /// <summary> 
-    /// </summary>
+        /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return null;

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
@@ -40,8 +36,8 @@ namespace formula_manage.ConvertMoels
                 }
             }
         }
-         /// <summary> 
+        /// <summary> 
-         /// </summary>
+        /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return null;

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
 {

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
 {
@@ -48,7 +38,7 @@ namespace formula_manage.EX
                 DataRow FileRow = logdataTable.NewRow();
 
                 FileRow["Name"] = item.Name;
-                FileRow["Length"] = item.Length/1024;
+                FileRow["Length"] = item.Length / 1024;
                 FileRow["CreationTimeUtc"] = item.CreationTimeUtc;
                 FileRow["LastWriteTimeUtc"] = item.LastWriteTimeUtc;
                 logdataTable.Rows.Add(FileRow);
@@ -68,7 +58,7 @@ namespace formula_manage.EX
                 LOGDATA_file((gridLog.Columns[0].GetCellContent(gridLog.Items[rownum]) as TextBlock).Text.TrimEnd());//
             }
 
-           logR.Visibility = Visibility.Hidden;
+            logR.Visibility = Visibility.Hidden;
         }
 
         private void LOGDATA_file(string dat) //读取文件显示到前端
@@ -77,8 +67,8 @@ namespace formula_manage.EX
             string filePath = System.Environment.CurrentDirectory + "\\Exchange\\";
             try
             {
-                    // 使用StreamReader读取文件
+                // 使用StreamReader读取文件
-                    using (StreamReader reader = new StreamReader(filePath + dat))
+                using (StreamReader reader = new StreamReader(filePath + dat))
                 {
                     // 读取文件直到文件的末尾      
                     while (!reader.EndOfStream)

Help.xaml.cs

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

IProvider.cs

@@ -1,10 +1,4 @@
-using System;
+namespace formula_manage
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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
 {
@@ -31,7 +18,7 @@ namespace formula_manage
 
         DataTable logindataTable = new DataTable();   //建立login缓存
 
-    public Login()
+        public Login()
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
@@ -73,7 +60,7 @@ namespace formula_manage
             {
                 string var_sql;
 
-                if (pasword =="") var_sql = "[UserCode]='" + user + "' and [PassWord] is null";  //查询字符
+                if (pasword == "") var_sql = "[UserCode]='" + user + "' and [PassWord] is null";  //查询字符
                 else var_sql = "[UserCode]='" + user + "' and [PassWord]='" + pasword + "'";
 
                 var loginOK = this.logindataTable.Select(var_sql).FirstOrDefault();   //查询账号信息是否正确，不正确返回null
@@ -91,7 +78,7 @@ namespace formula_manage
                     Main.ShowDialog();//实例化并置顶打开窗口
                 }
                 else
-                System.Windows.MessageBox.Show("账号或密码错误");
+                    System.Windows.MessageBox.Show("账号或密码错误");
             }
         }
 
@@ -134,11 +121,12 @@ namespace formula_manage
                 try
                 {
                     EXLINK.Background = Brushes.Green;
-                }catch(Exception) 
+                }
+                catch (Exception)
                 {
                     EXLINK.Background = Brushes.Red;
                     System.Windows.MessageBox.Show("扩展程序未启动");
-                    UserClass.LogGing.LogGingDATA("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "EX = FALL_TO_START");
+                    UserClass.LogGing.LogGingDATA("EX = FALL_TO_START");
                 }
             }
             try
@@ -149,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("配置信息丢失");
             }
@@ -167,8 +156,9 @@ namespace formula_manage
 
             try
             {
-               await conn_SC.OpenAsync();
+                await conn_SC.OpenAsync();
-            }catch (Exception) 
+            }
+            catch (Exception)
             {
                 DISPENLINK.Background = Brushes.Red; //连接失败红色
                 DBCLINK.Background = Brushes.Red;
@@ -176,7 +166,7 @@ namespace formula_manage
                 //Windows.Sql sql = new Windows.Sql();
                 //sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
 
-                UserClass.LogGing.LogGingDATA("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "DISPENLINK = ConnectFailed");
+                UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
 
                 return;
             }
@@ -203,14 +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();//实例化并置顶打开数据库设置窗口 
 
-                    UserClass.LogGing.LogGingDATA("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "DBCLINK = ConnectFailed");
+                    UserClass.LogGing.LogGingDATA("DBCLINK = ConnectFailed");
 
                     return;
                 }
@@ -238,7 +229,7 @@ namespace formula_manage
                 catch (Exception)
                 {
                     System.Windows.MessageBox.Show("请求信息失败，检查连接");
-                    UserClass.LogGing.LogGingDATA("[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：" + "USER = NoData");
+                    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
 {
@@ -47,13 +24,15 @@ namespace formula_manage
         Font font = new Font("Microsoft YaHei", 20);
 
         bool quit = false;
-       // DataTable DissolvedataTable = new DataTable();   //建立Dissolve缓存
+        // DataTable DissolvedataTable = new DataTable();   //建立Dissolve缓存
-       // DataTable STUFFdataTable = new DataTable();   //建立STUFF缓存
+        // DataTable STUFFdataTable = new DataTable();   //建立STUFF缓存
-       // DataTable MACHINEdataTable = new DataTable();   //建立Machine缓存
+        // DataTable MACHINEdataTable = new DataTable();   //建立Machine缓存
         DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT缓存
-       // DataTable RecipedataTable = new DataTable();   //建立Recipe缓存
+        // 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;
@@ -74,7 +53,15 @@ namespace formula_manage
             InitializeComponent();
             this.Closing += Window_Closing;   //添加窗口关闭事件
 
-            UserClass.TCPServer.Start();  //开启网路通讯
+            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));
@@ -127,8 +114,7 @@ namespace formula_manage
 
         private void PrintForms()//传入可用打印模板
         {
-            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+            int dirID = 0;
-            int dirID=0;
 
             DataTable Report = new DataTable();
             Report.Columns.Add("NAME", typeof(string));
@@ -156,9 +142,8 @@ namespace formula_manage
             Forms_.Text = Temp_m;
         }
 
-            private void sql_()
+        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");
@@ -194,9 +179,10 @@ namespace formula_manage
                 Stuff_data.Fill(logindataTable);    //查询结果存入缓存  
                 conn_SC.Close();  //关闭连接              
             }
-                catch (Exception)
+            catch (Exception)
             {
                 System.Windows.MessageBox.Show("请求信息失败，检查连接");
+                UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
                 return;
             }
 
@@ -258,8 +244,12 @@ namespace formula_manage
                 }
             }
 
-           // UserClass.LogGing.LogGingDATA(Log_time + "HttpSERVER_STOP");
+            // UserClass.LogGing.LogGingDATA(Log_time + "HttpSERVER_STOP");
-           // UserClass.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)  //回车跳转功能
@@ -302,7 +292,7 @@ namespace formula_manage
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             string PreposeT4 = Configini.IniReadvalue("SOFTWARE_SET", "T6");  //
-            string time =  System.DateTime.Now.ToString(PreposeT);  //获取系统时
+            string time = System.DateTime.Now.ToString(PreposeT);  //获取系统时
             if (PreposeT4 != time) PreposeSl = 0;
             PreposeSl = PreposeSl + 1;
             str_Prepose = String.Format("{0:D" + preposeL + "}", PreposeSl);
@@ -442,7 +432,7 @@ namespace formula_manage
             if (dialog.ShowDialog() == true)
             {
                 //  dialog.PrintVisual(printArea, "Print Test");
-             //   dialog.PrintVisual(richText, "测试");
+                //   dialog.PrintVisual(richText, "测试");
             }
 
             Print.IsEnabled = true;
@@ -502,6 +492,7 @@ namespace formula_manage
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("数据访问失败，重试");
+                UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
                 return;
             }   //单号重复检查
             if (Machine.Text == "")
@@ -569,7 +560,7 @@ namespace formula_manage
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";
 
-            System.Windows.MessageBox.Show(Number.Text+"-"+ ReDye.Text + "已保存");
+            System.Windows.MessageBox.Show(Number.Text + "-" + ReDye.Text + "已保存");
 
             Number_Event();
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);  //记录当前单序号
@@ -630,7 +621,7 @@ namespace formula_manage
         public void Recevie_order(string[] value)//订单选择信息传递
         {
             order.Text = value[0];
-            Technology.Text = value[1]+"@" + value[2];
+            Technology.Text = value[1] + "@" + value[2];
         }
 
         private void Button_Order(object sender, RoutedEventArgs e)
@@ -648,7 +639,7 @@ namespace formula_manage
         private void Button_Technology(object sender, RoutedEventArgs e)
         {
             ViewProcess viewProcess = new ViewProcess();
-                viewProcess.sendMessage = Recevie_Technology;
+            viewProcess.sendMessage = Recevie_Technology;
             Deputy.Content = viewProcess;  //打开工艺选择
         }
 
@@ -676,7 +667,7 @@ namespace formula_manage
             if (!r.Any()) return;  //检查信息
             if (double.Parse(r[0].ItemArray[1].ToString()) < a)
             {
-                System.Windows.MessageBox.Show("超载，确定重量","错误",MessageBoxButton.OK,MessageBoxImage.Error);
+                System.Windows.MessageBox.Show("超载，确定重量", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
                 list_Weight.Text = "0";
                 list_Total.Text = "0";
                 return;
@@ -684,7 +675,7 @@ namespace formula_manage
         }
         private void Proportion(object sender, TextChangedEventArgs e)  //浴比输入
         {
-            float a, b, c=0;
+            float a, b, c = 0;
             b = float.Parse(list_Proportion.Text);
             if (list_Weight.Text != "")  //判断比例是否有效
             {
@@ -708,7 +699,7 @@ namespace formula_manage
         string Name_;
         string Type_;
         string Conc_;
-        double Weight_=0;
+        double Weight_ = 0;
 
         private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//原料代码输入事件
         {
@@ -759,7 +750,7 @@ namespace formula_manage
                 Name_ = r[0].ItemArray[1].ToString();
                 Type_ = r[0].ItemArray[2].ToString();
                 Conc_ = r[0].ItemArray[3].ToString();
-                Conc_ = (double.Parse(Conc_)/100).ToString();
+                Conc_ = (double.Parse(Conc_) / 100).ToString();
 
                 if ((Type_ == "0") || (Type_ == "3"))
                 {
@@ -822,7 +813,7 @@ namespace formula_manage
         private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//目标饱和度输入事件
         {
             double ang;
-            double conc=0;
+            double conc = 0;
 
             System.Windows.Controls.TextBox curTextBox = sender as System.Windows.Controls.TextBox;
             int grid_row = Grid_RRODUCT.SelectedIndex;  //获取当前行
@@ -933,7 +924,7 @@ namespace formula_manage
             Name_ = r[0].ItemArray[1].ToString();
             Type_ = r[0].ItemArray[2].ToString();
             Conc_ = r[0].ItemArray[3].ToString();
-            Conc_ = (double.Parse(Conc_)/100).ToString();
+            Conc_ = (double.Parse(Conc_) / 100).ToString();
 
             if (double.TryParse(list_Weight.Text, out ang))
             {

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,14 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.SQLModels
 {
-  //  internal class STUFF_Product
+    //  internal class STUFF_Product
     //{
-   // }
+    // }
 
     public partial class Product
     {

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,11 +1,7 @@
 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
 {

UserClass/HardwareSN.cs

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

UserClass/IniFile.cs

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

UserClass/LogDataRead.cs

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

UserClass/LogGing.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
@@ -12,25 +8,30 @@ namespace formula_manage.UserClass
         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 logPath = "" + System.Environment.CurrentDirectory + "\\Log\\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt";//日志文件
             string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
+            if (Directory.Exists(logpath))//检查日志路径
-            if (!File.Exists(logPath))//检查日志文件并写入启动日志
             {
-                FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件 
+                if (!File.Exists(logPath))//检查日志文件并写入启动日志
-                StreamWriter wr = new StreamWriter(fs);//创建文件
+                {
-                wr.WriteLine(Log_time + dat);
+                    FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件 
-                wr.Close();
+                    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
             {
-                FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
-                StreamWriter wr = new StreamWriter(fs);//创建文件
+                directoryInfo.Create();//创建日志路径
-                wr.WriteLine(Log_time + dat);
-                wr.Close();
             }
-
         }
     }
 }

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
 {
@@ -30,8 +26,8 @@ namespace formula_manage.UserClass
                 //方法3
                 //int r3 = Convert.ToInt32(str, 16);
                 //Console.WriteLine(r3);
-     }
+            }
-            catch (Exception e)
+            catch (Exception)
             {
                 res = 0;
             }

UserClass/TCPServer.cs

@@ -1,223 +1,183 @@
 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.Text;
-using System.ComponentModel;
+using System.Threading.Tasks;
-using System.Data;
-using System.Drawing;
-using System.Net.NetworkInformation;
 
 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
+       //当前时间
+        private string CurrentTime
+        {
+            get { return DateTime.Now.ToString("HH:mm:ss") + Environment.NewLine; }
+        }
+
+        //编码格式  
+        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(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
             {
-                get { return DateTime.Now.ToString("HH:mm:ss") + Environment.NewLine; }
+                listenSocket.Bind(endPoint);
             }
-
+            catch (Exception ex)
-            //编码格式
-            Encoding econding = Encoding.Default;
-
-
-            public static void  Start()
             {
-                //第一步：调用socket()函数创建一个用于通信的套接字
+                UserClass.LogGing.LogGingDATA("TCP_NotStart");
-                listenSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                UserClass.LogGing.LogGingDATA(ex.Message);
-
+                return;
-                //第二步：给已经创建的套接字绑定一个端口号，这一般通过设置网络套接口地址和调用Bind()函数来实现
+            }
-                IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse(UserClass.get_local_ip_address.getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ethernet)), int.Parse("11080"));
+            //第三步：调用listen()函数使套接字成为一个监听套接字
-
+            listenSocket.Listen(10);
-                try
-                {
-                    listenSocket.Bind(endPoint);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("服务器开启失败：" + ex.Message, "开启服务器");
-                    return;
-                }
-
-                //第三步：调用listen()函数使套接字成为一个监听套接字
-                listenSocket.Listen(10);
-
             //ShowMessage("服务器开启成功");
 
-                //开启一个线程监听
+            //开启一个线程监听
-                Task.Run(new Action(() =>
+            Task.Run(new Action(() => { ListenConnection(); }));
-                {
+        }
-                    ListenConnection();
-                }
-                ));
-
-            }
 
         public static void ListenConnection()
+        {
+            while (true)
             {
-                while (true)
+                Socket clientSocket = listenSocket.Accept();
-                {
+                string ip = clientSocket.RemoteEndPoint.ToString();
-                    Socket clientSocket = listenSocket.Accept();
+                //更新在线列表
-
+                //   AddOnLine(ip, true);
-                    string ip = clientSocket.RemoteEndPoint.ToString();
+                //更新在线列表集合  
-
+                OnLineList.Add(ip, clientSocket);
-                    //更新在线列表
+                UserClass.LogGing.LogGingDATA("IP_Online = " + ip);
-                 //   AddOnLine(ip, true);
+                // ShowMessage(ip + "上线了");
-                    //更新在线列表集合
+                Task.Run(() => ReceiveMsg(clientSocket));
-                    OnLineList.Add(ip, clientSocket);
-
-                   // ShowMessage(ip + "上线了");
-
-                    Task.Run(() => ReceiveMsg(clientSocket));
-
-                }
-
             }
-
+        }
 
         /// <summary>
         /// 接收方法
         /// </summary>
         /// <param name="clientSocket"></param>
         public static void ReceiveMsg(Socket clientSocket)
+        {
+            while (true)
             {
-                while (true)
+                //定义一个2M的缓冲区  
+                byte[] buffer = new byte[1024 * 1024 * 10];
+
+                int length = -1;
+                try
                 {
-                    //定义一个2M的缓冲区
+                    length = clientSocket.Receive(buffer);
-                    byte[] buffer = new byte[1024 * 1024 * 2];
-
-                    int length = -1;
-                    try
-                    {
-                        length = clientSocket.Receive(buffer);
-                    }
-                    catch (Exception)
-                    {
-
-                        //客户端下线了
-
-                        //更新在线列表
-                        string ip = clientSocket.RemoteEndPoint.ToString();
-
-                     //   AddOnLine(ip, false);
-
-                        OnLineList.Remove(ip);
-
-                        break;
-                    }
-
-                    if (length == 0)
-                    {
-                        //客户端下线了
-
-                        //更新在线列表
-                        string ip = clientSocket.RemoteEndPoint.ToString();
-
-                    //    AddOnLine(ip, false);
-
-                        OnLineList.Remove(ip);
-
-                        break;
-                    }
-
-
-                  //  if (length > 0)
-               //     {
-                //        string info = econding.GetString(buffer, 0, length);
-                       // ShowMessage(info);
-              //      }
                 }
-            }
+                catch (Exception)
-/*
-            /// <summary>
-            /// 在线列表更新
-            /// </summary>
-            /// <param name="clientIp"></param>
-            /// <param name="value"></param>
-            private void AddOnLine(string clientIp, bool value)
-            {
-                Invoke(new Action(() =>
                 {
-                    if (value)
+                    //客户端下线了
-                    {
+                    //更新在线列表
-                        this.lst_Online.Items.Add(clientIp);
+                    string ip = clientSocket.RemoteEndPoint.ToString();
-                    }
+                    UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
-                    else
+                    //   AddOnLine(ip, false);
-                    {
+                    OnLineList.Remove(ip);  //移除ip
-                        this.lst_Online.Items.Remove(clientIp);
+                    break;   //退出循环
-                    }
+                }
 
-                }));
+                if (length == 0)
-
-            }
-
-
-            /// <summary>
-            /// 更新接收区
-            /// </summary>
-            /// <param name="info"></param>
-            private void ShowMessage(string info)
-            {
-                Invoke(new Action(() =>
                 {
-                    this.txt_Rcv.AppendText(CurrentTime + info + Environment.NewLine);
+                    //客户端下线了
-                }));
+                    //更新在线列表          
-
+                    string ip = clientSocket.RemoteEndPoint.ToString();
-            }
+                    UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
-*/
+                    //    AddOnLine(ip, false);
-/*
+                    OnLineList.Remove(ip);
-            /// <summary>
+                    break;
-            /// 消息发送
-            /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e"></param>
-            private void btn_Send_Click(object sender, EventArgs e)
-            {
-                if (this.lst_Online.SelectedItem != null)
-                {
-                    foreach (string item in this.lst_Online.SelectedItems)
-                    {
-                        if (OnLineList.ContainsKey(item))
-                        {
-                            OnLineList[item].Send(econding.GetBytes(this.txt_Send.Text.Trim()));
-                        }
-                    }
                 }
                 else
                 {
-                    MessageBox.Show("请先选择要发送的对象", "发送消息");
+                    infoR = econding.GetString(buffer, 0, length);
+                    //ShowMessage(info);
+                    string ip = clientSocket.RemoteEndPoint.ToString();
                 }
-
             }
 
-            /// <summary>
+        }
-            /// 群发功能
+        /*
-            /// </summary>
+                    /// <summary>
-            /// <param name="sender"></param>
+                    /// 在线列表更新
-            /// <param name="e"></param>
+                    /// </summary>
-            private void btn_SendAll_Click(object sender, EventArgs e)
+                    /// <param name="clientIp"></param>
-            {
+                    /// <param name="value"></param>
-                foreach (string item in this.lst_Online.Items)
+                    private void AddOnLine(string clientIp, bool value)
-                {
-                    if (OnLineList.ContainsKey(item))
                     {
-                        OnLineList[item].Send(econding.GetBytes(this.txt_Send.Text.Trim()));
+                        Invoke(new Action(() =>
+                        {
+                            if (value)
+                            {
+                                this.lst_Online.Items.Add(clientIp);
+                            }
+                            else
+                            {
+                                this.lst_Online.Items.Remove(clientIp);
+                            }
+
+                        }));
+
                     }
+
+
+                    /// <summary>
+                    /// 更新接收区
+                    /// </summary>
+                    /// <param name="info"></param>
+                    private void ShowMessage(string info)
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            this.txt_Rcv.AppendText(CurrentTime + info + Environment.NewLine);
+                        }));
+
+                    }
+
+        */
+        /// <summary>
+        /// 消息发送
+        /// </summary>
+        public static void Bn_Send(string IP, string DAT)
+        {
+            if (OnLineList.ContainsKey(IP))
+            {
+                OnLineList[IP].Send(econding.GetBytes(DAT));
+            }
+        }
+
+        /// <summary>
+        /// 群发功能
+        /// </summary>
+        public static void Btn_SendAll(string DAT)
+        {
+            foreach (string item in OnLineList.Keys.ToArray())
+            {
+                if (OnLineList.ContainsKey(item))
+                {
+                    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
@@ -192,11 +188,11 @@ namespace formula_manage.UserClass
 
 
                 MessageBox.Show("网络打印机不可用", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
-               // WriteLog.SetString(ex.Message);
+                // WriteLog.SetString(ex.Message);
             }
             else
             {
-               // WriteLog.SetException(ex);
+                // WriteLog.SetException(ex);
             }
         }
     }

UserClass/get_local_ip_address.cs

@@ -1,11 +1,5 @@
-using System;
+using System.Net.NetworkInformation;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Sockets;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using System.Net.NetworkInformation;
 
 namespace formula_manage.UserClass
 {
@@ -29,5 +23,24 @@ namespace formula_manage.UserClass
             }
             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.Windows.Controls;
-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;
 
 namespace formula_manage.View
 {

View/ViewOrder.xaml.cs

@@ -1,28 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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 FastReport.Editor;
-using FastReport.DevComponents.DotNetBar;
 
 namespace formula_manage.View
 {
     /// <summary>
     /// ViewProcess.xaml 的交互逻辑
     /// </summary>
-    public partial class ViewOrder: UserControl
+    public partial class ViewOrder : UserControl
     {
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
 
@@ -92,8 +80,8 @@ namespace formula_manage.View
 
             a = condition.SelectedIndex;  //获取选择条件
 
-            if(a==1) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where ProcessNAME = '"+ search.Text + "' order by OrdeTime desc";//查询语句
+            if (a == 1) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where ProcessNAME = '" + search.Text + "' order by OrdeTime desc";//查询语句
-            else if(a==2) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where customer = '" + search.Text + "' order by OrdeTime desc";//查询语句
+            else if (a == 2) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where customer = '" + search.Text + "' order by OrdeTime desc";//查询语句
             else if (a == 3) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where colour = '" + search.Text + "' order by OrdeTime desc";//查询语句
             else if (a == 0) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
 

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.UserClass;
-using formula_manage.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
 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 RRODUCTdataTable = new DataTable();   //建立RRODUCT
-        DataTable RecipedataTable = new DataTable();   //建立Recipe
+                                                        //  DataTable RecipedataTable = new DataTable();   //建立Recipe
 
         public static DataTable STUFFdatatemp = new DataTable();   //建立STUFF缓存
         public static DataTable MACHINEdatatemp = new DataTable();   //建立Machine缓存
@@ -54,7 +41,7 @@ namespace formula_manage.ViewModel
         public string cdk_time;  //注册到期时间
         public string cdk_page = "Hidden";  //注册到期页面状态
         public string cdk_pageT;  //注册到期页面关闭时间
-        int cdk_pageT_T=-1;////注册到期页面关闭时间计算
+        int cdk_pageT_T = -1;////注册到期页面关闭时间计算
 
         public string Sys_Time  //通知UI控件参数改变
         {
@@ -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;
             }
         }
@@ -285,7 +274,7 @@ namespace formula_manage.ViewModel
             {
                 cdk_pageT_T--;
                 Cdk_pageT = cdk_pageT_T.ToString();
-                if(cdk_pageT_T == 1) Cdk_page = "Hidden";
+                if (cdk_pageT_T == 1) Cdk_page = "Hidden";
             }
 
         }

ViewModel/RECIPEViewModel.cs

@@ -1,36 +1,23 @@
-using formula_manage.SQLModels;
+using System;
-using formula_manage.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
-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.Forms;
 using System.Windows.Threading;
-using System.Xml.Linq;
 
 namespace formula_manage.ViewModel
 {
 
-  /*  public class ViewModelBase : INotifyPropertyChanged
+    /*  public class ViewModelBase : INotifyPropertyChanged
-    {
+      {
-        public event PropertyChangedEventHandler PropertyChanged;
+          public event PropertyChangedEventHandler PropertyChanged;
 
-        protected virtual void OnPropertyChanged(string propertyName)
+          protected virtual void OnPropertyChanged(string propertyName)
-        {
+          {
-            if (this.PropertyChanged != null)
+              if (this.PropertyChanged != null)
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                  this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-        }
+          }
-    }*/
+      }*/
     ///<Summary>
     ///
     /// 
@@ -191,40 +178,40 @@ namespace formula_manage.ViewModel
         }
     }
 
-  /*  public class Product   //stuff_Product
+    /*  public class Product   //stuff_Product
-    {
+      {
-        public string ProductCode { get; set; }
+          public string ProductCode { get; set; }
-        public string ProductName { get; set; }
+          public string ProductName { get; set; }
-        public int ProductType { get; set; }
+          public int ProductType { get; set; }
-        public int Concentration { get; set; }
+          public int Concentration { get; set; }
 
-        public override string ToString()
+          public override string ToString()
-        {
+          {
-            return ProductCode;
+              return ProductCode;
-        }
+          }
-    }
+      }
-    public class Machine   //mac
+      public class Machine   //mac
-    {
+      {
-        public string Name { get; set; }
+          public string Name { get; set; }
-        public float Volume { get; set; }
+          public float Volume { get; set; }
-        public float Capacity { get; set; }
+          public float Capacity { get; set; }
 
-        public override string ToString()
+          public override string ToString()
-        {
+          {
-            return Name;
+              return Name;
-        }
+          }
-    }
+      }
-    public class Workflow   //Dissolve
+      public class Workflow   //Dissolve
-    {
+      {
-        public string DissolveName { get; set; }
+          public string DissolveName { get; set; }
-        public int MaterialType { get; set; }
+          public int MaterialType { get; set; }
-        public int WeightMIN { get; set; }
+          public int WeightMIN { get; set; }
-        public int WeightMAX { get; set; }
+          public int WeightMAX { get; set; }
 
-        public override string ToString()
+          public override string ToString()
-        {
+          {
-            return DissolveName;
+              return DissolveName;
-        }
+          }
-    }*/
+      }*/
 
 }

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
 {
@@ -33,7 +22,7 @@ namespace formula_manage.Windows
         string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
         {
-            MessageBoxResult result = System.Windows.MessageBox.Show("设置完成后请重启程序","提示", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
+            MessageBoxResult result = System.Windows.MessageBox.Show("设置完成后请重启程序", "提示", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());

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");    //读配置文件
 
-            try 
+            if (cdk.Length == 16)
             {
-                string Y = (2255 - StrToInt.To16Convert10(cdk.Text.Substring(6, 2))).ToString();
+                if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Substring(0, 12)), true) == cdk.Substring(12, 4)) //校验key的crc校验值
-                string M = (255 - StrToInt.To16Convert10(cdk.Text.Substring(8, 2))).ToString();
+                {
-                string D = (255 - StrToInt.To16Convert10(cdk.Text.Substring(10, 2))).ToString();
+                    try
-                sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
+                    {
+                        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)
+                    {
+                        sn_time.Text = "注册有效时间: --------";
+                    }
+                }
+                else
+                {
+                    sn_time.Text = "注册有效时间: --------";
+                }
             }
-            catch (Exception ex) { }
+            else
+            {
+                sn_time.Text = "注册有效时间: --------";
+            }
+
             // 获取CPU序列号
             cpuSerialNumber = HardwareSN.GetCPUSerialNumber();
             // 获取主板序列号
@@ -59,7 +60,7 @@ namespace formula_manage.Windows
             //string hardDiskSerialNumber = HardwareSN.GetHardDiskSerialNumber();
             // 获取网卡地址
             //string netCardMACAddress = HardwareSN.GetNetCardMACAddress();
-            sn_id.Text = MD5check.MD5Encrypt16(cpuSerialNumber+ biosSerialNumber);//生成id基于硬件值的md5校验                                                                                 
+            sn_id.Text = MD5check.MD5Encrypt16(cpuSerialNumber + biosSerialNumber);//生成id基于硬件值的md5校验                                                                                 
 
         }
 
@@ -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校验值
                 {
@@ -86,7 +93,7 @@ namespace formula_manage.Windows
                         {
                             if (string.Compare(D, DD) >= 0)
                             {
-                                System.Windows.MessageBox.Show("CDKEY: 注册成功，请重启软件", "KEY",MessageBoxButton.OK,MessageBoxImage.Asterisk);
+                                System.Windows.MessageBox.Show("CDKEY: 注册成功，请重启软件", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk);
                                 sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
 
                                 UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
@@ -123,7 +130,7 @@ namespace formula_manage.Windows
                     }
                     else
                     {
-                        System.Windows.MessageBox.Show("CDKEY: 注册码过期","WARNING",MessageBoxButton.OK,MessageBoxImage.Warning);
+                        System.Windows.MessageBox.Show("CDKEY: 注册码过期", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning);
                     }
                 }
                 else
@@ -133,7 +140,7 @@ namespace formula_manage.Windows
             }
             else
             {
-                System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR" , MessageBoxButton.OK,MessageBoxImage.Error);
+                System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 

Windows/Dissolve.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -127,7 +113,7 @@ namespace formula_manage.Windows
             string Dissolve_sql;
             int int_ion = 0;
 
-            if ((name.Text == "") ||(Code.Text == ""))
+            if ((name.Text == "") || (Code.Text == ""))
             {
                 System.Windows.MessageBox.Show("请输入代码或名称");
                 return;
@@ -173,7 +159,7 @@ namespace formula_manage.Windows
                     if (count == 0)
                     {
                         Dissolve_sql = string.Format("INSERT INTO[dbo].[Dissolve](DissolveCode ,DissolveName ,REMARK ,MaterialType ,WeightMIN ,WeightMAX) " +
-                                                     "VALUES ('" + Code.Text + "','" + name.Text + "','" + Remark.Text + "','" + int_ion + "','"+ min.Text + "','" + max.Text + "')");
+                                                     "VALUES ('" + Code.Text + "','" + name.Text + "','" + Remark.Text + "','" + int_ion + "','" + min.Text + "','" + max.Text + "')");
                         await conn_SC.OpenAsync();    //打开数据连接           
                         SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC);
                         int sql_in = INSERT_cmd.ExecuteNonQuery();     //执行语句

Windows/Machine.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -132,7 +118,7 @@ namespace formula_manage.Windows
                 /*定位选中行及指定列单元格文本信息*/
                 mac_Name.Text = (DataGridMac.Columns[1].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第列
                 mac_MacGroup.Text = (DataGridMac.Columns[2].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
-                mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac  .Items[rownum]) as TextBlock).Text.TrimEnd();//
+                mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
                 mac_Volume.Text = (DataGridMac.Columns[4].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
                 mac_Industry.Text = (DataGridMac.Columns[5].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
                 mac_Categories.Text = (DataGridMac.Columns[6].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//

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 FastReport;
-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 formula_manage.UserClass;
-using System.Xml.Linq;
+using System;
-using FastReport.Format;
+using System.Collections.Generic;
-using Svg;
+using System.Drawing.Printing;
 using System.IO;
-using System.Windows.Media.Media3D;
+using System.Windows;
-using System.Reflection;
+using System.Windows.Forms;
-using FastReport;
+using System.Xml.Linq;
 
 namespace formula_manage.Windows
 {
@@ -96,8 +78,8 @@ namespace formula_manage.Windows
             Template_M.Text = Temp_M;//传入保存的默认模板
             Template_S.Text = Temp_S;//
 
-            Template.ItemsSource = files_M;
+            PrintTemplate.ItemsSource = files_M;
-            Template.DisplayMemberPath = "Name";
+            PrintTemplate.DisplayMemberPath = "Name";
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
@@ -152,13 +134,13 @@ namespace formula_manage.Windows
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //编辑模板
         {
-           if (string.IsNullOrEmpty(Template_M.Text))
+            if (string.IsNullOrEmpty(Template_M.Text))
             {
                 System.Windows.MessageBox.Show("模板不能为空");
                 return;
             }
 
-            var tuple = PrintHelper.Design(Print_path.Text+"/" + Template_M.Text);
+            var tuple = PrintHelper.Design(Print_path.Text + "/" + Template_M.Text);
             if (!tuple.Item1)
             {
                 System.Windows.MessageBox.Show($"打开设计器失败：{tuple.Item2}");
@@ -172,7 +154,7 @@ namespace formula_manage.Windows
                 return;
             }
 
-            var tuple = PrintHelper.Design(Print_path2.Text +"/" + Template_S.Text);
+            var tuple = PrintHelper.Design(Print_path2.Text + "/" + Template_S.Text);
             if (!tuple.Item1)
             {
                 System.Windows.MessageBox.Show($"打开设计器失败：{tuple.Item2}");
@@ -227,7 +209,7 @@ namespace formula_manage.Windows
                         list.Add(xePrintName);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }
@@ -239,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)) //判断文件是否存在
@@ -248,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;//去页面遮罩
@@ -265,7 +247,7 @@ namespace formula_manage.Windows
             }
 
             PRINT_file(); ;//刷新模板列表
-            Template.Text = null;//清空输入
+            PrintTemplate.Text = null;//清空输入
 
             Prompt.Visibility = Visibility.Hidden;//去页面遮罩
         }
@@ -274,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
@@ -282,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;//加载合集
+            PrintTemplate.ItemsSource = files_M;//加载合集
-            Template.DisplayMemberPath = "Name"; // 显示文件名
+            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
 {
@@ -164,8 +137,8 @@ namespace formula_manage.Windows
         {
             Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
             Regex re_char = new Regex(@"^[A-Za-z0-9\s@（)()/+!！_-]+$");//校验用正则表达式由数字,26个英文字母，空白字符和@（)()/+!！_-组成的字符串         
-           // string Dissolve_sql;
+                                                                      // string Dissolve_sql;
-           // int int_ion = 0;
+                                                                      // int int_ion = 0;
 
         }
 

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;
 
 
 
@@ -59,7 +48,7 @@ namespace formula_manage.Windows
             SQLTIME = Boolean.Parse(Configini.IniReadvalue("SQL_BAK", "S3"));
             int.TryParse(Configini.IniReadvalue("SQL_BAK", "S4"), out Time);
             if (Time == 0) SQL_TIME.Text = "日";
-            else if(Time == 1) SQL_TIME.Text = "周";
+            else if (Time == 1) SQL_TIME.Text = "周";
             else if (Time == 2) SQL_TIME.Text = "月";
             else if (Time == 3) SQL_TIME.Text = "季";
             else if (Time == 4) SQL_TIME.Text = "年";
@@ -90,7 +79,7 @@ namespace formula_manage.Windows
             Dilog.SelectedPath = SQL_DISPEN_bak.Text;  //打开目录
             Dilog.ShowNewFolderButton = false;   //不显示新建文件夹按钮
                                                  //
-            if (Dilog.ShowDialog() == System.Windows.Forms.DialogResult.OK ) 
+            if (Dilog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
                 SQL_DISPEN_bak.Text = Dilog.SelectedPath;   //返回选择的字符串
             }

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.Windows;
-using System.Runtime.InteropServices;
-using System.ComponentModel;
-using System.Data.SqlTypes;
 
 
 namespace formula_manage.Windows

Windows/Stuff.xaml.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -88,7 +75,7 @@ namespace formula_manage.Windows
         /// </summary>
         private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
         {
-                e.Row.Header = e.Row.GetIndex() + 1;
+            e.Row.Header = e.Row.GetIndex() + 1;
         }
 
         private void Radiobutton(object sender, EventArgs e)
@@ -125,11 +112,11 @@ namespace formula_manage.Windows
         /// <summary>
         /// 查询数据库的方法
         /// </summary>
-        private async void GridSql(int e )  
+        private async void GridSql(int e)
         {
             string Stuff_sql = null;
             if (e == 0) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT]";//查询语句                               
-            else if (e == 1)  Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type  FROM [dbo].[PRODUCT] Where ProductType = '0' ";
+            else if (e == 1) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type  FROM [dbo].[PRODUCT] Where ProductType = '0' ";
             else if (e == 2) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '1' ";
             else if (e == 3) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '2' ";
             else if (e == 4) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '3' ";
@@ -178,7 +165,7 @@ namespace formula_manage.Windows
             else if (this.stuff_ProductType.Text == "液体染料")
                 int_stuff_ProductType = 3;
 
-            if(Stuff_ion.Text == "分散") int_stuff_ion = 0;
+            if (Stuff_ion.Text == "分散") int_stuff_ion = 0;
             else if (Stuff_ion.Text == "酸性") int_stuff_ion = 1;
             else if (Stuff_ion.Text == "活性") int_stuff_ion = 2;
             else if (Stuff_ion.Text == "中性") int_stuff_ion = 3;
@@ -226,7 +213,7 @@ namespace formula_manage.Windows
                         string StuffColor_B = string.Format("{0:X2}", colorValue.Substring(7, 2));//获取蓝色参数C3            
                         string StuffColor = StuffColor_B + StuffColor_G + StuffColor_R;//合并16进制rgb参数            
                         ColorCode_SQL = Convert.ToInt32(StuffColor, 16);//16进制转10进制
-                        if (ColorCode_SQL < 0)  ColorCode_SQL = 16777215;//判断色彩数据是否有效        
+                        if (ColorCode_SQL < 0) ColorCode_SQL = 16777215;//判断色彩数据是否有效        
                     }
                     else
                     {
@@ -242,7 +229,7 @@ namespace formula_manage.Windows
 
                     if (count == 0)
                     {
-                        Stuff_sql = string.Format( "INSERT INTO [dbo].[PRODUCT](ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ) " +
+                        Stuff_sql = string.Format("INSERT INTO [dbo].[PRODUCT](ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ) " +
                                                   "VALUES ('" + Product_Code + "','" + Product_Name + "','" + _Price + "','" + _SUPPLIER + "','" + int_stuff_ProductType + "','" + ColorCode_SQL + "','" + _Concentration + "','" + _GRAVITY + "')");
                         await conn_SC.OpenAsync();    //打开数据连接           
                         SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
@@ -270,7 +257,7 @@ namespace formula_manage.Windows
                     }
                     else
                     {
-                        Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET ProductName='" + Product_Name + "',Price='" + _Price + "',SUPPLIER='" + _SUPPLIER + "',ProductType=" + int_stuff_ProductType + ",Color=" + ColorCode_SQL + ",Concentration=" + _Concentration + ",GRAVITY=" + _GRAVITY + " Where ProductCode='"+ Product_Code+"'");
+                        Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET ProductName='" + Product_Name + "',Price='" + _Price + "',SUPPLIER='" + _SUPPLIER + "',ProductType=" + int_stuff_ProductType + ",Color=" + ColorCode_SQL + ",Concentration=" + _Concentration + ",GRAVITY=" + _GRAVITY + " Where ProductCode='" + Product_Code + "'");
                         await conn_SC.OpenAsync();    //打开数据连接           
                         SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
                         int sql_in = INSERT_cmd.ExecuteNonQuery();    //执行语句

Windows/User.xaml.cs

@@ -1,24 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -141,49 +127,49 @@ namespace formula_manage.Windows
             string note = Note.Text;
             string Stuff_sql;
 
-            if(Capacity.Text == "停用") Cap = 0;
+            if (Capacity.Text == "停用") Cap = 0;
             else if (Capacity.Text == "限制") Cap = 1;
             else if (Capacity.Text == "启用") Cap = 2;
 
             if (name != "")
             {
-                    try
+                try
+                {
+                    SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化 
+                    Stuff_sql = "SELECT count(*)   FROM [Dispensing].[dbo].[UserAccount] WHERE UserCode = '" + name + " '";//查询语句                             
+                    await conn_SC.OpenAsync();    //打开数据连   
+                    SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC);    //查询记录数
+                    int count = Convert.ToInt32(cmd.ExecuteScalar());    //显示记录数  
+                    conn_SC.Close();  //关闭连接
+
+                    if (count == 0)
                     {
-                        SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化 
+                        if (password == "")
-                        Stuff_sql = "SELECT count(*)   FROM [Dispensing].[dbo].[UserAccount] WHERE UserCode = '" + name + " '";//查询语句                             
-                        await conn_SC.OpenAsync();    //打开数据连   
-                        SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC);    //查询记录数
-                        int count = Convert.ToInt32(cmd.ExecuteScalar());    //显示记录数  
-                        conn_SC.Close();  //关闭连接
-
-                        if (count == 0)
                         {
-                            if (password == "")
+                            Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
-                            {
+                                                     "VALUES ('" + name + "',null,'" + Group + "'," + Cap + ",'" + note + "')";
-                                Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
-                                                         "VALUES ('" + name + "',null,'" + Group + "'," + Cap + ",'" + note + "')";
-                            }
-                            else
-                            {
-                                Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
-                                                         "VALUES ('" + name + "'," + password + ",'" + Group + "'," + Cap + ",'" + note + "')";
-                            }
-                                              
-                            await conn_SC.OpenAsync();    //打开数据连接           
-                            SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
-                            int sql_in = INSERT_cmd.ExecuteNonQuery();     //执行语句
-                            conn_SC.Close();  //关闭连接
-                            if (sql_in == 0)
-                            {      
-                                System.Windows.MessageBox.Show("添加失败");
-                            }        
-                            else   
-                            {
-                                GridSql(); 
-                            }
                         }
                         else
                         {
+                            Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
+                                                     "VALUES ('" + name + "'," + password + ",'" + Group + "'," + Cap + ",'" + note + "')";
+                        }
+
+                        await conn_SC.OpenAsync();    //打开数据连接           
+                        SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
+                        int sql_in = INSERT_cmd.ExecuteNonQuery();     //执行语句
+                        conn_SC.Close();  //关闭连接
+                        if (sql_in == 0)
+                        {
+                            System.Windows.MessageBox.Show("添加失败");
+                        }
+                        else
+                        {
+                            GridSql();
+                        }
+                    }
+                    else
+                    {
 
                         if (password == "")
                         {
@@ -193,26 +179,26 @@ namespace formula_manage.Windows
                         {
                             Stuff_sql = string.Format("UPDATE [dbo].[UserAccount] SET PassWord=" + password + " ,GROUP_CODE='" + Group + "' ,Capacity=" + Cap + " ,Note='" + note + "' Where UserCode ='" + name + "'");
                         }
-                            await conn_SC.OpenAsync();    //打开数据连接               
+                        await conn_SC.OpenAsync();    //打开数据连接               
-                            SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);        
+                        SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
-                            int sql_in = INSERT_cmd.ExecuteNonQuery();     //执行语句
+                        int sql_in = INSERT_cmd.ExecuteNonQuery();     //执行语句
-                            conn_SC.Close();  //关闭连接
+                        conn_SC.Close();  //关闭连接
 
-                            if (sql_in == 0)     
+                        if (sql_in == 0)
-                            {    
+                        {
-                                System.Windows.MessageBox.Show("修改失败");
+                            System.Windows.MessageBox.Show("修改失败");
-                            }
+                        }
-                            else
+                        else
-                            {
+                        {
-                                GridSql();
+                            GridSql();
-                            }
                         }
                     }
-                    catch (Exception)
+                }
-                    {
+                catch (Exception)
-                        System.Windows.MessageBox.Show("请求失败，检查连接");
+                {
-                        return;
+                    System.Windows.MessageBox.Show("请求失败，检查连接");
-                    }               
+                    return;
+                }
             }
         }
 

Windows/client.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -89,7 +74,7 @@ namespace formula_manage.Windows
         /// </summary>
         private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
         {
-                e.Row.Header = e.Row.GetIndex() + 1;
+            e.Row.Header = e.Row.GetIndex() + 1;
         }
 
         /// <summary>
@@ -161,7 +146,7 @@ namespace formula_manage.Windows
                     }
                     else
                     {
-                        client_sql = string.Format("UPDATE [dbo].[Client] SET Name='" + client_name.Text + "',Remark='" + client_Remark.Text + "' Where Code='"+ client_code.Text + "'");
+                        client_sql = string.Format("UPDATE [dbo].[Client] SET Name='" + client_name.Text + "',Remark='" + client_Remark.Text + "' Where Code='" + client_code.Text + "'");
                         await conn_SC.OpenAsync();    //打开数据连接           
                         SqlCommand INSERT_cmd = new SqlCommand(client_sql, conn_SC);
                         int sql_in = INSERT_cmd.ExecuteNonQuery();    //执行语句

Windows/color.xaml.cs

@@ -1,25 +1,11 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -89,7 +75,7 @@ namespace formula_manage.Windows
         /// </summary>
         private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
         {
-                e.Row.Header = e.Row.GetIndex() + 1;
+            e.Row.Header = e.Row.GetIndex() + 1;
         }
 
         /// <summary>

Windows/fabric.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
-using System.Linq;
+using System.Data.SqlClient;
-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.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
 {
@@ -89,7 +74,7 @@ namespace formula_manage.Windows
         /// </summary>
         private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
         {
-                e.Row.Header = e.Row.GetIndex() + 1;
+            e.Row.Header = e.Row.GetIndex() + 1;
         }
 
         /// <summary>
@@ -164,7 +149,7 @@ namespace formula_manage.Windows
                     }
                     else
                     {
-                        fabric_sql = string.Format("UPDATE [dbo].[PRODUCTION_Material] SET Name='" + fabric_name.Text + "',GYard='" + fabric_GYard.Text + "',Remark='" + fabric_Remark.Text + "' Where Code='"+ fabric_code.Text + "'");
+                        fabric_sql = string.Format("UPDATE [dbo].[PRODUCTION_Material] SET Name='" + fabric_name.Text + "',GYard='" + fabric_GYard.Text + "',Remark='" + fabric_Remark.Text + "' Where Code='" + fabric_code.Text + "'");
                         await conn_SC.OpenAsync();    //打开数据连接           
                         SqlCommand INSERT_cmd = new SqlCommand(fabric_sql, conn_SC);
                         int sql_in = INSERT_cmd.ExecuteNonQuery();    //执行语句

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.11\build\net462\FastReport.Net.Demo.props" Condition="Exists('packages\FastReport.Net.Demo.2024.2.11\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,282 +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.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Buffers.0.7.6\lib\net472\DotNetty.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Codecs, Version=0.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Codecs.0.7.6\lib\net472\DotNetty.Codecs.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Codecs.Http, Version=0.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Codecs.Http.0.7.6\lib\net472\DotNetty.Codecs.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Common, Version=0.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Common.0.7.6\lib\net472\DotNetty.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Handlers, Version=0.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Handlers.0.7.6\lib\net472\DotNetty.Handlers.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetty.Transport, Version=0.7.6.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetty.Transport.0.7.6\lib\net472\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.11.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Bars, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.Bars.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Compat, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Compat.2024.2.11\lib\net462\FastReport.Compat.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.DataVisualization, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.DataVisualization.2024.2.11\lib\net462\FastReport.DataVisualization.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Editor, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.VSDesign, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.VSDesign.dll</HintPath>
-    </Reference>
-    <Reference Include="FastReport.Web, Version=2024.2.11.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <HintPath>packages\FastReport.Net.Demo.2024.2.11\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="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.8.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.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="SuperSocket.Common, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
-      <HintPath>packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="SuperSocket.Facility, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
-      <HintPath>packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Facility.dll</HintPath>
-    </Reference>
-    <Reference Include="SuperSocket.SocketBase, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
-      <HintPath>packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.SocketBase.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=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Collections.Immutable.8.0.0\lib\net462\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.Configuration" />
-    <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\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.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Net.Http.4.3.4\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.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.4.3.1\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.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.Extensions.4.3.1\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.1\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.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.2\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.1\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.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.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" />
@@ -400,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.1\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">
@@ -664,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>
@@ -706,16 +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\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'))" />
-    <Error Condition="!Exists('packages\FastReport.Net.Demo.2024.2.11\build\net462\FastReport.Net.Demo.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\FastReport.Net.Demo.2024.2.11\build\net462\FastReport.Net.Demo.props'))" />
-    <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.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')" />
-  <Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>

packages.config

@@ -1,91 +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.7.6" targetFramework="net472" />
-  <package id="DotNetty.Codecs" version="0.7.6" targetFramework="net472" />
-  <package id="DotNetty.Codecs.Http" version="0.7.6" targetFramework="net472" />
-  <package id="DotNetty.Common" version="0.7.6" targetFramework="net472" />
-  <package id="DotNetty.Handlers" version="0.7.6" targetFramework="net472" />
-  <package id="DotNetty.Transport" version="0.7.6" 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.11" targetFramework="net472" />
-  <package id="FastReport.DataVisualization" version="2024.2.11" targetFramework="net472" />
-  <package id="FastReport.Net.Demo" version="2024.2.11" targetFramework="net472" />
-  <package id="FastReport.OpenSource" version="2024.2.1" targetFramework="net472" />
-  <package id="log4net" version="2.0.17" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="8.0.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging" version="8.0.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net472" />
-  <package id="Microsoft.NETCore.Platforms" version="7.0.4" 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="2.0.3" 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="SuperSocket" version="1.6.6.1" targetFramework="net472" />
-  <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="8.0.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.1" 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="8.0.1" 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.4" targetFramework="net472" />
-  <package id="System.Net.Primitives" version="4.3.1" 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.1" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Runtime.Extensions" version="4.3.1" 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.1" 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.2" 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.1" 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.ValueTuple" version="4.5.0" targetFramework="net472" />
-  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net472" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
-  <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
-</packages>