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

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

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;           

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 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缓存
@@ -182,7 +182,8 @@ namespace formula_manage.ViewModel
             }
             catch (Exception)
             {
-                System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
+                System.Windows.MessageBox.Show("请求信息失败");
+                UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
                 return;
             }
         }

formula_manage.csproj

@@ -125,27 +125,6 @@
     <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>

packages.config

@@ -3,13 +3,6 @@
   <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" />