From 4cca6af72fa2288f433a7c4d604f9639d3fbfc63 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 02 七月 2025 18:47:44 +0800
Subject: [PATCH] 1

---
 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/TcpServer.cs |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
index 4ebf30c..c20febb 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
@@ -117,19 +117,23 @@
                         //{
                         Console.WriteLine($"銆怲CP淇℃伅鍗忚 {DateTime.Now.Millisecond}銆戯細IP锛歿remote_ip},MSG锛歿message}");
                         var mg = Encoding.ASCII.GetString(PlcHelper.Hex2Bin(message));
+                        if (mg.Length > 10)
+                        {
+                            mg = mg.Substring(0, 10);
+                        }
                         Console.WriteLine(mg);
-                        if (mg.StartsWith("DK") && mg.Trim().Length == "DK01000024".Length)
+                        if (mg.StartsWith("DK"))//&& mg.Trim().Length == "DK01000024".Length
                         {
                             LogHelper.Info($"鎵爜鍣�>{remote_ip} -{mg}");
                             if (TrayIps.TryGetValue(remote_ip, out string traycode))
                             {
-                                TrayIps[remote_ip] = traycode;
+                                TrayIps[remote_ip] = mg;
                             }
-                            else TrayIps.Add(remote_ip, traycode);
+                            else TrayIps.Add(remote_ip, mg);
 
-                            Console.WriteLine("TOFF");
-                            var mst = PlcHelper.Hex2Bin("544F4646");
-                            TcpServer.TcpServerSend(remote_ip, mst);
+                            //Console.WriteLine("TOFF");
+                            //var mst = PlcHelper.Hex2Bin("544F4646");
+                            //TcpServer.TcpServerSend(remote_ip, mst);
                         }
                         //}
                     }
@@ -170,7 +174,7 @@
                 {
                     try
                     {
-                        client.Send(msg); 
+                        client.Send(msg);
                         LogHelper.Info($"TcpServerSend > 鍙戦�鎴愬姛銆�);
                         return true;
                     }

--
Gitblit v1.9.1