From 745d1ce73a3b27d2a3507843c8060755a0c95765 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期二, 21 十月 2025 19:06:36 +0800
Subject: [PATCH] 打印机条码格式修改,增添一个点检功能方法

---
 src/Bro.M141.Process/MyMQTT.cs |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Bro.M141.Process/MyMQTT.cs b/src/Bro.M141.Process/MyMQTT.cs
index 84ea30a..da6a495 100644
--- a/src/Bro.M141.Process/MyMQTT.cs
+++ b/src/Bro.M141.Process/MyMQTT.cs
@@ -8,7 +8,6 @@
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using SourceGrid.Cells.Editors;
-
 using Sunny.UI.Win32;
 using System;
 using System.Collections.Concurrent;
@@ -81,8 +80,6 @@
                 InitConsumer(_receiveChannel2, _queue2, HandleQueue2Message);
             }
 
-
-
             CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, "RabbitMQ 杩炴帴鎴愬姛");
         }
 
@@ -111,16 +108,19 @@
                 }
                 else
                 {
+
+                    CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ 绡叿 鏀跺埌鏈尮閰� zbguid锛歿obj?.zbguid}");
+
                     if (MSGClasses.Any(u => u.zguid == obj?.zbguid))
                     {
                         var tem = MSGClasses.FirstOrDefault(u => u.zguid == obj?.zbguid);
                         if (!string.IsNullOrEmpty(tem.receive))
                         {
                             tem.receive = message;
+
+                            CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ 绡叿鏈夎秴鏃跺姩浣滐紝鎴暀涓嬪尮閰嶄俊鎭細{message}");
                         }
                     }
-
-                    CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ 绡叿 鏀跺埌鏈尮閰� zbguid锛歿obj?.zbguid}");
                 }
             }
             catch (Exception ex)
@@ -148,6 +148,7 @@
                 CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"RabbitMQ 鐗╂枡 瑙f瀽寮傚父锛歿ex.Message}");
             }
         }
+
         //Dictionary<string, Task> dic_ispass = new Dictionary<string, Task>();///value涓烘敹鍒版暟鎹�
 
         public async Task<string> MESForBasketAsync(string ztype, string zlsn, string zlpn, string zstatus, string zversion, int timeoutMes = 30000)
@@ -164,21 +165,28 @@
                 {
                     if (!string.IsNullOrEmpty(tem.receive))
                     {
+
+                        CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ {keystr}浜屾鎺ユ敹 杩斿洖鍊兼甯� {tem.receive}");
+                    
                         return tem.receive;
                     }
                     Thread.Sleep(1000);
                 }
-                MSGClasses.RemoveAll(u => u.key == keystr);
-                return tem.receive;
+                if (MSGClasses.Count > 10)
+                {
+                    MSGClasses.RemoveAt(0);
+                    CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ浜屾鎺ユ敹鏁版嵁瓒呰繃鍗佹潯 娓呴櫎绗竴鏉¤秴鏃舵暟鎹�");
+                }
+                //MSGClasses.RemoveAll(u => u.key == keystr);
+               
+
+                return null;
             }
-
-
 
 
             var guid = Guid.NewGuid().ToString();
             var tcs = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             _pendingTask1[guid] = tcs;
-
 
             var msgObj = new AutoLineMacQueue
             {
@@ -218,11 +226,6 @@
                 return null;
             }
         }
-
-
-
-
-
 
 
         public async Task<string> MESForProduceAsync(ProductModel pro, string zversion, int znonum, string endtray = "N", string line = "NQ216", int timeoutMs = 3000)

--
Gitblit v1.8.0