diff --git a/Login.xaml.cs b/Login.xaml.cs index 9fa6fde..762bbb1 100644 --- a/Login.xaml.cs +++ b/Login.xaml.cs @@ -138,7 +138,7 @@ namespace formula_manage { 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 @@ -176,7 +176,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; } @@ -210,7 +210,7 @@ namespace formula_manage //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 +238,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; } } diff --git a/UserClass/TCPServer.cs b/UserClass/TCPServer.cs index da6c073..85e8a82 100644 --- a/UserClass/TCPServer.cs +++ b/UserClass/TCPServer.cs @@ -90,9 +90,7 @@ namespace formula_manage.UserClass int length = -1; try - { - length = clientSocket.Receive(buffer); } catch (Exception) @@ -102,7 +100,6 @@ namespace formula_manage.UserClass string ip = clientSocket.RemoteEndPoint.ToString(); UserClass.LogGing.LogGingDATA("IP_Line = " + ip); // AddOnLine(ip, false); - OnLineList.Remove(ip); break; diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index cb073c6..3ec0e57 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -43,8 +43,8 @@ namespace formula_manage.ViewModel DataTable DissolvedataTable = new DataTable(); //建立Dissolve DataTable STUFFdataTable = new DataTable(); //建立STUFF DataTable MACHINEdataTable = new DataTable(); //建立Machine - DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT - DataTable RecipedataTable = new DataTable(); //建立Recipe + // DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT + // DataTable RecipedataTable = new DataTable(); //建立Recipe public static DataTable STUFFdatatemp = new DataTable(); //建立STUFF缓存 public static DataTable MACHINEdatatemp = new DataTable(); //建立Machine缓存 @@ -182,7 +182,8 @@ namespace formula_manage.ViewModel } catch (Exception) { - System.Windows.MessageBox.Show("请求原料信息失败,检查连接"); + System.Windows.MessageBox.Show("请求信息失败"); + UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed"); return; } } diff --git a/formula_manage.csproj b/formula_manage.csproj index 2f41cdc..75e5631 100644 --- a/formula_manage.csproj +++ b/formula_manage.csproj @@ -125,27 +125,6 @@ packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll - - packages\DotNetty.Buffers.0.7.6\lib\net472\DotNetty.Buffers.dll - - - packages\DotNetty.Codecs.0.7.6\lib\net472\DotNetty.Codecs.dll - - - packages\DotNetty.Codecs.Http.0.7.6\lib\net472\DotNetty.Codecs.Http.dll - - - packages\DotNetty.Common.0.7.6\lib\net472\DotNetty.Common.dll - - - packages\DotNetty.Handlers.0.7.6\lib\net472\DotNetty.Handlers.dll - - - packages\DotNetty.Transport.0.7.6\lib\net472\DotNetty.Transport.dll - - - packages\DotNettySocket.1.2.0\lib\net45\DotNettySocket.dll - packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.dll diff --git a/packages.config b/packages.config index cd4da6c..34494b6 100644 --- a/packages.config +++ b/packages.config @@ -3,13 +3,6 @@ - - - - - - -