wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整,任务完成代码逻辑

Browse Source
This commit is contained in:
alex
2023-08-16 14:43:20 +08:00
parent 370321611a
commit 3a0a27f4af
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -519,12 +519,13 @@ namespace Tnb.WarehouseMgr
BasLocation loc = new(); BasLocation loc = new();
loc.id = multiList[i].endlocation_id; loc.id = multiList[i].endlocation_id;
loc.is_lock = 0; loc.is_lock = 0;
loc.is_use = multiList[i].carry_status;
if (multiList[i].carry_status.ToEnum<EnumCarryStatus>() == EnumCarryStatus.空闲) if (multiList[i].carry_status.ToEnum<EnumCarryStatus>() == EnumCarryStatus.空闲)
{ {
loc.is_use = ((int)EnumCarryStatus.占用).ToString(); loc.is_use = ((int)EnumCarryStatus.占用).ToString();
} }
locIts.Add(loc);
locIts.Add(loc);
} }
await _db.Updateable(carryIts).UpdateColumns(it => new { it.is_lock, it.location_id, it.location_code }).ExecuteCommandAsync(); await _db.Updateable(carryIts).UpdateColumns(it => new { it.is_lock, it.location_id, it.location_code }).ExecuteCommandAsync();

6
WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
View File

@@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr
_cacheManager = cacheManager; _cacheManager = cacheManager;
_runService = runService; _runService = runService;
_visualDevService = visualDevService; _visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create; //OverideFuncs.CreateAsync = Create;
} }
private async Task<dynamic> Create(VisualDevModelDataCrInput input) private async Task<dynamic> Create(VisualDevModelDataCrInput input)
@@ -271,6 +271,10 @@ namespace Tnb.WarehouseMgr
cts?.Cancel(); cts?.Cancel();
throw timedTaskEx; throw timedTaskEx;
} }
finally
{
await Publish(nameof(IWareHouseService.GenTaskExecute));
}
} }
private async Task InnerGenPreTask(WmsCarryH[] carrys, List<string> locIds, string eLocationId, string requireId, string requireCode, List<WmsPretaskH> preTasks, BasLocation endLocation) private async Task InnerGenPreTask(WmsCarryH[] carrys, List<string> locIds, string eLocationId, string requireId, string requireCode, List<WmsPretaskH> preTasks, BasLocation endLocation)

2
system/Tnb.OAuth/OAuthService.cs
View File

@@ -388,6 +388,8 @@ public class OAuthService : IDynamicApiController, ITransient
{ {
//await _cacheManager.DelAsync("AsscessToken"); //await _cacheManager.DelAsync("AsscessToken");
UserManager.AsscessToken = string.Empty;
var tenantId = _userManager.TenantId ?? "default"; var tenantId = _userManager.TenantId ?? "default";
var userId = _userManager.UserId ?? "admim"; var userId = _userManager.UserId ?? "admim";
var httpContext = _httpContextAccessor.HttpContext; var httpContext = _httpContextAccessor.HttpContext;