bug

ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs

@@ -7,6 +7,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Security.Policy;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using Aop.Api.Domain;
 using Aspose.Cells.Charts;
 using JNPF;
@@ -109,16 +110,6 @@ namespace Tnb.ProductionMgr
 
         private readonly ElevatorControlConfiguration _eleCtlCfg = App.Configuration.Build<ElevatorControlConfiguration>();
 
-        Thread testThread;
-        void test()
-        {
-            while (true)
-            {
-                Console.WriteLine(DateTime.Now + " test " + CheckGettimer?.GetHashCode());
-
-                Thread.Sleep(1000);
-            }
-        }
         #endregion
 
         #region 构造函数
@@ -147,8 +138,6 @@ namespace Tnb.ProductionMgr
             db_Floor2timer移走上升降区未生成预任务且满托的料架 = repository.CopyNew();
             db_Floor2timer移走下升降区未生成预任务且空托的料架 = repository.CopyNew();
 
-            testThread = new Thread(test);
-            testThread.Start();
         }
 
         #endregion
@@ -157,6 +146,8 @@ namespace Tnb.ProductionMgr
         //ctu取货
         private async void CheckGet(object? state)
         {
+            if (s_taskCheckGet.CurrentCount == 0)
+                return;
             await s_taskCheckGet.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -338,6 +329,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         //扫码入库
         private async void ScanInStock(object? state)
         {
+            if (s_taskScan.CurrentCount == 0)
+                return;
             await s_taskScan.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -433,6 +426,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// </summary>
         private async void BGWCarrySupplement(object? state)
         {
+            if (s_taskBGWCarrySupplement.CurrentCount == 0)
+                return;
             await s_taskBGWCarrySupplement.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -546,6 +541,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// </summary>
         private async void YCLGLDPJInstock(object? state)
         {
+            if (s_taskYCLGLDPJInstock.CurrentCount == 0)
+                return;
             await s_taskYCLGLDPJInstock.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -631,6 +628,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// </summary>
         private async void YCLWXDPJInstock(object? state)
         {
+            if (s_taskYCLWXDPJInstock.CurrentCount == 0)
+                return;
             await s_taskYCLWXDPJInstock.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -714,6 +713,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
 
         private async void SSXcode(object? state)
         {
+            if (s_taskSSXcode.CurrentCount == 0)
+                return;
             await s_taskSSXcode.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -808,6 +809,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         // 上升降机扫码 需要等待空料架区 此处需要轮询
         private async void Floor2UpMachinecode(object? args)
         {
+            if (s_taskExecuteFloor2UpMachinecodetimer.CurrentCount == 0)
+                return;
             s_taskExecuteFloor2UpMachinecodetimer.Wait();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -991,6 +994,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// <returns></returns>
         public async void 送空托到上升降区(object? args)
         {
+            if (s_task送空托到上升降区.CurrentCount == 0)
+                return;
             await s_task送空托到上升降区.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -1112,6 +1117,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// <returns></returns>
         public async void 送满托到下升降区(object? args)
         {
+            if (s_task送满托到下升降区.CurrentCount == 0)
+                return;
             await s_task送满托到下升降区.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -1257,6 +1264,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// <returns></returns>
         public async void 移走上升降区未生成预任务且满托的料架(object? args)
         {
+            if (s_task移走上升降区未生成预任务且满托的料架.CurrentCount == 0)
+                return;
             await s_task移走上升降区未生成预任务且满托的料架.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -1358,6 +1367,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// <returns></returns>
         public async void 移走下升降区未生成预任务且空托的料架(object? args)
         {
+            if (s_task移走下升降区未生成预任务且空托的料架.CurrentCount == 0)
+                return;
             await s_task移走下升降区未生成预任务且空托的料架.WaitAsync();
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();