From 3a0a27f4afabc9ffee2898842305c17e6f6f7765 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 16 Aug 2023 14:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4,=E4=BB=BB=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 3 ++- WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs | 6 +++++- system/Tnb.OAuth/OAuthService.cs | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 8348fe82..26c20959 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -519,12 +519,13 @@ namespace Tnb.WarehouseMgr BasLocation loc = new(); loc.id = multiList[i].endlocation_id; loc.is_lock = 0; + loc.is_use = multiList[i].carry_status; if (multiList[i].carry_status.ToEnum() == EnumCarryStatus.空闲) { loc.is_use = ((int)EnumCarryStatus.占用).ToString(); } + locIts.Add(loc); - } await _db.Updateable(carryIts).UpdateColumns(it => new { it.is_lock, it.location_id, it.location_code }).ExecuteCommandAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs index 1ae618ae..e526f989 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs @@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr _cacheManager = cacheManager; _runService = runService; _visualDevService = visualDevService; - OverideFuncs.CreateAsync = Create; + //OverideFuncs.CreateAsync = Create; } private async Task Create(VisualDevModelDataCrInput input) @@ -271,6 +271,10 @@ namespace Tnb.WarehouseMgr cts?.Cancel(); throw timedTaskEx; } + finally + { + await Publish(nameof(IWareHouseService.GenTaskExecute)); + } } private async Task InnerGenPreTask(WmsCarryH[] carrys, List locIds, string eLocationId, string requireId, string requireCode, List preTasks, BasLocation endLocation) diff --git a/system/Tnb.OAuth/OAuthService.cs b/system/Tnb.OAuth/OAuthService.cs index 9dd7f421..70bdb220 100644 --- a/system/Tnb.OAuth/OAuthService.cs +++ b/system/Tnb.OAuth/OAuthService.cs @@ -388,6 +388,8 @@ public class OAuthService : IDynamicApiController, ITransient { //await _cacheManager.DelAsync("AsscessToken"); + UserManager.AsscessToken = string.Empty; + var tenantId = _userManager.TenantId ?? "default"; var userId = _userManager.UserId ?? "admim"; var httpContext = _httpContextAccessor.HttpContext;