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

ConvertMoels/CategoriesSQLConvert.cs

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

ConvertMoels/ColorSQLConvert.cs

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

ConvertMoels/DeviationConvert.cs

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

ConvertMoels/GramsSQLConvert.cs

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

ConvertMoels/IndustrySQLConvert.cs

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

ConvertMoels/IonSQLConvert.cs

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

ConvertMoels/ProductTypeSQLConvert.cs

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

ConvertMoels/StatenConvert.cs

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

ConvertMoels/StatenERRConvert.cs

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

ConvertMoels/UserSQLConvert.cs

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

EX/ExProgram.xaml.cs

@@ -1,17 +1,5 @@
 using formula_manage.UserClass;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace formula_manage.EX
 {

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);

Help.xaml.cs

@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace formula_manage
 {

IProvider.cs

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

Login.xaml.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Runtime.InteropServices;
-using System.Data.SqlClient;
-using System.Data;
-using System.Security.Policy;
-using System.IO;
-using formula_manage.Windows;
 
 namespace formula_manage
 {
@@ -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
@@ -134,7 +121,8 @@ namespace formula_manage
                 try
                 {
                     EXLINK.Background = Brushes.Green;
-                }catch(Exception) 
+                }
+                catch (Exception)
                 {
                     EXLINK.Background = Brushes.Red;
                     System.Windows.MessageBox.Show("扩展程序未启动");
@@ -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("配置信息丢失");
             }
@@ -168,7 +157,8 @@ namespace formula_manage
             try
             {
                 await conn_SC.OpenAsync();
-            }catch (Exception) 
+            }
+            catch (Exception)
             {
                 DISPENLINK.Background = Brushes.Red; //连接失败红色
                 DBCLINK.Background = Brushes.Red;
@@ -203,7 +193,8 @@ namespace formula_manage
                 try
                 {
                     await conn_DBC.OpenAsync();
-                }catch (Exception) 
+                }
+                catch (Exception)
                 {
                     DBCLINK.Background = Brushes.Red; //连接失败红色
                     System.Windows.MessageBox.Show("连接数据库失败");

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
 {
@@ -76,7 +53,15 @@ namespace formula_manage
             InitializeComponent();
             this.Closing += Window_Closing;   //添加窗口关闭事件
 
-            if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6"))) 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));
@@ -129,7 +114,7 @@ namespace formula_manage
 
         private void PrintForms()//传入可用打印模板
         {
-            int dirID=0;
+            int dirID = 0;
 
             DataTable Report = new DataTable();
             Report.Columns.Add("NAME", typeof(string));
@@ -575,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);  //记录当前单序号
@@ -636,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)
@@ -682,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;
@@ -690,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 != "")  //判断比例是否有效
             {
@@ -714,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)//原料代码输入事件
         {
@@ -765,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"))
                 {
@@ -828,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;  //获取当前行
@@ -939,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,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace formula_manage.SQLModels
 {

UserClass/CRCcheck16.cs

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

UserClass/Code128.cs

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

UserClass/DataGridHelper.cs

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

UserClass/DataTableForToObservableCollection.cs

@@ -1,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.Collections.Generic;
-using System.Linq;
-using System.Management;
-using System.Text;
-using System.Threading.Tasks;
+using System.Management;
 
 namespace formula_manage.UserClass
 {

UserClass/IniFile.cs

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

UserClass/LogDataRead.cs

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

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,10 +8,11 @@ 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);//创建写入文件 
@@ -28,9 +25,13 @@ namespace formula_manage.UserClass
                     FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
                     StreamWriter wr = new StreamWriter(fs);//创建文件
                     wr.WriteLine(Log_time + dat);
-                wr.Close();
+                    wr.Close();                }
+            }
+            else
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
+                directoryInfo.Create();//创建日志路径
             }
-
         }
     }
 }

UserClass/MD5check.cs

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

UserClass/PressKey.cs

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

UserClass/PrintHelper.cs

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

UserClass/StrToInt.cs

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

UserClass/TCPServer.cs

@@ -1,17 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Windows.Forms;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace formula_manage.UserClass
 {
@@ -24,16 +18,15 @@ namespace formula_manage.UserClass
         //字典集合：存储IP和Socket的集合
         public static Dictionary<string, Socket> OnLineList = new Dictionary<string, Socket>();
 
-        DataTable IPdataTable = new DataTable();   //建立缓存
-                                                        //当前时间
        
+       //当前时间
         private string CurrentTime
         {
             get { return DateTime.Now.ToString("HH:mm:ss") + Environment.NewLine; }
         }
 
         //编码格式  
-        public static Encoding econding = Encoding.Default;
+        public static Encoding econding = Encoding.UTF8;
 
         public static void Start()
         {
@@ -41,7 +34,7 @@ namespace formula_manage.UserClass
             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("NativeIP = " + UserClass.get_local_ip_address.IP_Address());
             UserClass.LogGing.LogGingDATA("NativePORT = 11080");
             try
             {
@@ -58,7 +51,7 @@ namespace formula_manage.UserClass
             //ShowMessage("服务器开启成功");
 
             //开启一个线程监听
-            Task.Run(new Action(() =>{ListenConnection();} )); 
+            Task.Run(new Action(() => { ListenConnection(); }));
         }
 
         public static void ListenConnection()
@@ -71,7 +64,7 @@ namespace formula_manage.UserClass
                 //   AddOnLine(ip, true);
                 //更新在线列表集合  
                 OnLineList.Add(ip, clientSocket);
-                UserClass.LogGing.LogGingDATA("IP_Online = "+ ip);
+                UserClass.LogGing.LogGingDATA("IP_Online = " + ip);
                 // ShowMessage(ip + "上线了");
                 Task.Run(() => ReceiveMsg(clientSocket));
             }
@@ -86,7 +79,7 @@ namespace formula_manage.UserClass
             while (true)
             {
                 //定义一个2M的缓冲区  
-                byte[] buffer = new byte[1024 * 1024 * 2];
+                byte[] buffer = new byte[1024 * 1024 * 10];
 
                 int length = -1;
                 try
@@ -100,12 +93,10 @@ namespace formula_manage.UserClass
                     string ip = clientSocket.RemoteEndPoint.ToString();
                     UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
                     //   AddOnLine(ip, false);
-                    OnLineList.Remove(ip);
-     
-                    break;           
+                    OnLineList.Remove(ip);  //移除ip
+                    break;   //退出循环
                 }
 
-               
                 if (length == 0)
                 {
                     //客户端下线了
@@ -114,11 +105,9 @@ namespace formula_manage.UserClass
                     UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
                     //    AddOnLine(ip, false);
                     OnLineList.Remove(ip);
-              
                     break;
                 }
-
-                if (length > 0) 
+                else
                 {
                     infoR = econding.GetString(buffer, 0, length);
                     //ShowMessage(info);
@@ -127,7 +116,7 @@ namespace formula_manage.UserClass
             }
 
         }
-/*
+        /*
                     /// <summary>
                     /// 在线列表更新
                     /// </summary>
@@ -164,11 +153,11 @@ namespace formula_manage.UserClass
 
                     }
 
-*/
+        */
         /// <summary>
         /// 消息发送
         /// </summary>
-        public static void Bn_Send(string IP ,string DAT) 
+        public static void Bn_Send(string IP, string DAT)
         {
             if (OnLineList.ContainsKey(IP))
             {

UserClass/UserPrint.cs

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

UserClass/get_local_ip_address.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using System.Net.NetworkInformation;
 
 namespace formula_manage.UserClass
 {
@@ -35,7 +29,7 @@ namespace formula_manage.UserClass
             string ip;
 
             ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ethernet);
-            if(ip=="")ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wireless80211);
+            if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wireless80211);
             if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ppp);
             if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wwanpp);
             if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.TokenRing);

View/Formula.xaml.cs

@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace formula_manage.View
 {

View/ViewOrder.xaml.cs

@@ -1,28 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Data.SqlClient;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using FastReport.Editor;
-using FastReport.DevComponents.DotNetBar;
 
 namespace formula_manage.View
 {
     /// <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";//查询语句
-            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";//查询语句
+            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 == 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.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
+using formula_manage.UserClass;
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using System.Xml.Linq;
 
 namespace formula_manage.ViewModel
 {
@@ -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
 
                 {
@@ -286,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,22 +1,9 @@
-using formula_manage.SQLModels;
-using formula_manage.ViewModel;
-using formula_manage.Windows;
-using GalaSoft.MvvmLight;
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using System.Xml.Linq;
 
 namespace formula_manage.ViewModel
 {

ViewModel/ViewModelLocator.cs

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

Windows/APP_set.xaml.cs

@@ -1,17 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace formula_manage.Windows
 {
@@ -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
@@ -77,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校验                                                                                 
 
         }
 
@@ -86,7 +69,7 @@ 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(cdk.Text.Length != 16)
+            if (cdk.Text.Length != 16)
             {
                 System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
@@ -110,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);
@@ -147,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
@@ -157,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.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {
@@ -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.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {
@@ -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 System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using ThoughtWorks.QRCode.Codec;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Drawing.Printing;
+using FastReport;
 using formula_manage.UserClass;
-using System.Xml.Linq;
-using FastReport.Format;
-using Svg;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Printing;
 using System.IO;
-using System.Windows.Media.Media3D;
-using System.Reflection;
-using FastReport;
+using System.Windows;
+using System.Windows.Forms;
+using System.Xml.Linq;
 
 namespace formula_manage.Windows
 {
@@ -96,8 +78,8 @@ namespace formula_manage.Windows
             Template_M.Text = Temp_M;//传入保存的默认模板
             Template_S.Text = Temp_S;//
 
-            Template.ItemsSource = files_M;
-            Template.DisplayMemberPath = "Name";
+            PrintTemplate.ItemsSource = files_M;
+            PrintTemplate.DisplayMemberPath = "Name";
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
@@ -158,7 +140,7 @@ namespace formula_manage.Windows
                 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;//加载合集
-            Template.DisplayMemberPath = "Name"; // 显示文件名
+            PrintTemplate.ItemsSource = files_M;//加载合集
+            PrintTemplate.DisplayMemberPath = "Name"; // 显示文件名
         }
     }
 }

Windows/RECIPE.xaml.cs

@@ -1,41 +1,14 @@
-using formula_manage.Windows;
+using formula_manage.UserClass;
+using formula_manage.ViewModel;
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using formula_manage.ViewModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using static System.Net.Mime.MediaTypeNames;
-using formula_manage.UserClass;
-using System.Drawing;
-using System.Diagnostics;
-using System.Printing;
-using System.Drawing.Printing;
-using static System.Drawing.Printing.PrinterSettings;
-using formula_manage.View;
-using FastReport.DevComponents.AdvTree;
 
 namespace formula_manage.Windows
 {

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

Windows/Stuff.xaml.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {
@@ -125,7 +112,7 @@ 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]";//查询语句                               
@@ -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;
@@ -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.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
 
 namespace formula_manage.Windows
 {
@@ -141,7 +127,7 @@ 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;
 

Windows/client.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {
@@ -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.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {

Windows/fabric.xaml.cs

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using GalaSoft.MvvmLight;
-using formula_manage.SQLModels;
-using System.Data.SqlClient;
-using System.Data;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-using Xceed.Wpf.AvalonDock.Themes;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace formula_manage.Windows
 {
@@ -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,93 +114,12 @@
   </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="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="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="ModernUI.Xceed.AvalonDock, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="ModernUI.Xceed.Toolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.Toolkit.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
-    </Reference>
-    <Reference Include="Smart.FormDesigner, Version=1.4.8302.26895, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Smart.FormDesigner.1.4.3\lib\net40\Smart.FormDesigner.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <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.Drawing" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management" />
@@ -212,9 +129,6 @@
     <Reference Include="System.ServiceProcess" />
     <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" />
@@ -223,27 +137,9 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </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">
@@ -482,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>
@@ -524,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,29 +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="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="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="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="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
-  <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
-</packages>