From 009f9b29116a63b18eace1f5351091daefbfd6fe Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Mon, 15 Jul 2024 23:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.ProductionMgr/RedisBackGround.cs          | 15 +++++++++------
 .../Tnb.WarehouseMgr/WmsSaleReleaseService.cs     | 10 ++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
index 6493d340..e3219857 100644
--- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
@@ -126,6 +126,8 @@ namespace Tnb.ProductionMgr
         private ISqlSugarClient db_Floor4DMJ2MJX;
         private ISqlSugarClient db_Floor4MJX2MJC;
         private ISqlSugarClient db_Floor4DMC2CPK;
+        private ISqlSugarClient db_ElevatorTaskExceptionHandle;
+        
 
         private readonly IWmsPDAScanInStockService _wmsPDAScanInStock;
         private readonly IUserManager _userManager;
@@ -180,7 +182,8 @@ namespace Tnb.ProductionMgr
             db_Floor4DMJ2MJX = repository.CopyNew();
             db_Floor4MJX2MJC = repository.CopyNew();
             db_Floor4DMC2CPK = repository.CopyNew();
-    }
+            db_ElevatorTaskExceptionHandle = repository.CopyNew();
+        }
 
         #endregion
 
@@ -1730,7 +1733,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
 
         async void ElevatorTaskExceptionHandle(object args)
         {
-            List<WmsDistaskH> wmsDistaskHs = _repository.AsSugarClient().Queryable<WmsDistaskH>()
+            List<WmsDistaskH> wmsDistaskHs = db_ElevatorTaskExceptionHandle.Queryable<WmsDistaskH>()
                 .Where(r => r.startlocation_code.Contains("DT") && r.endlocation_code.Contains("DT") && r.act_start_date == null && r.act_end_date == null).ToList();
 
             LoggerElevatorTask.Information($"【ElevatorTaskExceptionHandle】检查到需要恢复的电梯任务{wmsDistaskHs.Count}条 {string.Join(',', wmsDistaskHs.Select(x => x.bill_code))}");
@@ -1884,7 +1887,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                 Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} 开始执行四楼待灭菌仓到灭菌线");
                 LoggerTimer.LogInformation($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} 开始执行四楼待灭菌仓到灭菌线");
 
-                if (false)
+                if (true)
                 {
                     return;
                 }
@@ -2096,9 +2099,9 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
             ElevatorTaskExceptionHandleThread = new Thread(ElevatorTaskExceptionHandle);
             ElevatorTaskExceptionHandleThread.Start();
 
-            Floor4DMJ2MJXtimer = new Timer(Floor4DMJ2MJX, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
-            Floor4MJX2MJCtimer = new Timer(Floor4MJX2MJC, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
-            Floor4DMC2CPKtimer = new Timer(Floor4DMC2CPK, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
+            //Floor4DMJ2MJXtimer = new Timer(Floor4DMJ2MJX, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
+            //Floor4MJX2MJCtimer = new Timer(Floor4MJX2MJC, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
+            //Floor4DMC2CPKtimer = new Timer(Floor4DMC2CPK, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
 
             return Task.CompletedTask;
         }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs
index 481f825d..5f57f044 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs
@@ -176,6 +176,16 @@ namespace Tnb.WarehouseMgr
                 List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items_pretask = items.Where(r => r.Item1 == "预任务").ToList();
 
                 Logger.LogInformation($"【Distribute】 预计生成{items_pretask.Count}条预任务");
+
+
+                List<BasLocation> endLocations = await _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1OutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0").ToListAsync();
+
+                if (endLocations.Count < items_pretask.Count)
+                {
+                    throw new AppFriendlyException("一楼没有足够的未锁定且空闲的出库工位", 500);
+                }
+
+
                 // 预任务逻辑
                 foreach (Tuple<string, WmsCarryH, WmsCarryCode, BasLocation> item in items_pretask)
                 {