继续调整,手动开启定时任务相关逻辑代码,并处理相关bug
This commit is contained in:
@@ -211,9 +211,10 @@ namespace Tnb.WarehouseMgr
|
||||
whereExprable.And(carryStatusFilterExp);
|
||||
var whereExpr = whereExprable.ToExpression();
|
||||
|
||||
var policy = await _db.Queryable<WmsInstockPolicies>().Where(it => it.status == 1).FirstAsync();
|
||||
var cyDb = _db.CopyNew();
|
||||
var policy = await cyDb.Queryable<WmsInstockPolicies>().Where(it => it.status == 1).FirstAsync();
|
||||
if (policy == null) throw new AppFriendlyException("没有可用策略", 500);
|
||||
var items = await _db.Queryable<WmsCarryH>().LeftJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
|
||||
var items = await cyDb.Queryable<WmsCarryH>().LeftJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
|
||||
.LeftJoin<BasLocation>((a, b, c) => a.location_id == c.id)
|
||||
.Where(whereExpr)
|
||||
.OrderBy(policy.policy)
|
||||
@@ -226,7 +227,7 @@ namespace Tnb.WarehouseMgr
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Timed(Name = nameof(IWareHouseService.GenTaskExecute))]
|
||||
public async Task GenTaskExecute(CancellationTokenSource? cts = default)
|
||||
public async Task GenTaskExecute(CancellationToken? ct = default)
|
||||
{
|
||||
Stopwatch sw = Stopwatch.StartNew();
|
||||
CancellationTokenSource agvCts = new();
|
||||
@@ -378,13 +379,11 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
Log.Error("生成预任务执行时出现错误", ex);
|
||||
await db.Ado.RollbackTranAsync();
|
||||
cts?.Cancel();
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
agvCts.Dispose();
|
||||
cts?.Dispose();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user