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

App.xaml.cs

@@ -38,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;
@@ -65,18 +61,26 @@ namespace formula_manage
                                 );
             }
 
-            System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录
+            string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
+            string logpath = System.Environment.CurrentDirectory + "\\ERR";//日志文件目录
+            //string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件
+            // System.IO.DirectoryInfo log = new System.IO.DirectoryInfo();//生成日志文件目录
             string log_path = logpath + "\\ERR" + Log_time + ".txt";
             string Log_timehms = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            if (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
                 {
@@ -89,6 +93,12 @@ namespace formula_manage
                     wr.Close();
                 }
             }
+            else
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
+                directoryInfo.Create();
+            }
+        }
 
         /// <summary>
         /// 启动初始页面

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

@@ -53,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));

UserClass/LogGing.cs

@@ -11,7 +11,8 @@ namespace formula_manage.UserClass
             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);//创建写入文件 
@@ -24,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/TCPServer.cs

@@ -18,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()
         {
@@ -80,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
@@ -94,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)
                 {
                     //客户端下线了
@@ -108,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);

formula_manage.csproj

@@ -426,18 +426,54 @@
     <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>
@@ -447,6 +483,12 @@
     <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>
@@ -456,15 +498,48 @@
     <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" />
 </Project>