From 26dd70efb39fc49812ea3d249936f887fbbe0a44 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Tue, 15 Aug 2023 15:19:14 +0800
Subject: [PATCH] 1

---
 .../Tnb.WarehouseMgr/TimedTaskBackgroundService.cs       | 9 +++++----
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs     | 8 ++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs b/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs
index 24e8b64f..ca8b341e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs
@@ -44,9 +44,10 @@ namespace Tnb.WarehouseMgr
         static TimedTaskBackgroundService()
         {
             _timedFuncMap = App.EffectiveTypes.AsParallel().Where(t => !t.Namespace.IsNullOrWhiteSpace() && t.Namespace.Contains("Tnb.WarehouseMgr")).SelectMany(t => t.GetMethods())
-                               .Where(m => m.GetCustomAttribute<TimedAttribute>() != null)
-                               .ToDictionary(x => x.Name, x =>
-                               (Func<CancellationTokenSource?, Task>)Delegate.CreateDelegate(typeof(Func<CancellationTokenSource?, Task>), App.GetService(x.DeclaringType), x));
+                                   .Where(m => m.GetCustomAttribute<TimedAttribute>() != null)
+                                   .ToDictionary(x => x.Name, x =>
+                                   (Func<CancellationTokenSource?, Task>)Delegate.CreateDelegate(typeof(Func<CancellationTokenSource?, Task>), App.GetService(x.DeclaringType), x));
+
         }
         public TimedTaskBackgroundService(IServiceProvider serviceProvider)
         {
@@ -59,7 +60,7 @@ namespace Tnb.WarehouseMgr
                   var channelReader = _serviceProvider.GetRequiredService<ITaskMessageNotify>().Reader;
 
                   CancellationTokenSource? cts = new();
-                  
+
                   while (channelReader != null && await channelReader.WaitToReadAsync())
                   {
                       while (channelReader.TryRead(out var message))
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
index 4ceb0e1b..c283d43b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
@@ -42,7 +42,6 @@ namespace Tnb.WarehouseMgr
         private readonly IWareHouseService _wareHouseService;
         private readonly IBillRullService _billRullService;
         private readonly IUserManager _userManager;
-        private readonly ChannelWriter<NotifyMessage> _channelWriter;
 
         public WmsPDAInbaleService(
             ISqlSugarRepository<WmsCarryH> repository,
@@ -51,7 +50,7 @@ namespace Tnb.WarehouseMgr
             IWareHouseService wareHouseService,
             IUserManager userManager,
             IBillRullService billRullService,
-            ChannelWriter<NotifyMessage> channelWriter)
+            ITaskMessageNotify taskMessageNotify):base(taskMessageNotify.Writer)
         {
             _db = repository.AsSugarClient();
             _runService = runService;
@@ -59,7 +58,6 @@ namespace Tnb.WarehouseMgr
             _wareHouseService = wareHouseService;
             _userManager = userManager;
             _billRullService = billRullService;
-            _channelWriter = channelWriter;
             OverideFuncs.CreateAsync = Inbale;
         }
 
@@ -173,9 +171,7 @@ namespace Tnb.WarehouseMgr
             }
             finally
             {
-                //向队列写入消息
-                NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) };
-                await _channelWriter.WriteAsync(message);
+                await Publish(nameof(IWareHouseService.GenTaskExecute));
             }
             return Task.FromResult(true);
         }