This commit is contained in:
FanLian
2023-06-15 11:13:57 +08:00
11 changed files with 358 additions and 6 deletions

View File

@@ -395,14 +395,40 @@ namespace Tnb.WarehouseMgr
//更新任务执行表,单据状态为 完成
await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
//更新预任务申请表,单据状态为 已完成
var preTaskIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.pretask_id).ToListAsync();
if(preTaskIds?.Count > 0)
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync();
if (disTasks?.Count > 0)
{
var preTaskIds = disTasks.Select(x => x.pretask_id).ToList();
await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
}
//更新载具,锁定状态为未锁定,更新载具的库位当前任务的目标库位
if (disTasks?.Count > 0)
{
var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList();
for (int i = 0; i < multiList.Count; i++)
{
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
}
}
//更新库位信息,使用状态为 使用,锁定状态为未锁定
if (disTasks?.Count > 0)
{
var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync();
}
//更新业务主表的单据状态
if (disTasks?.Count > 0)
{
foreach (var dt in disTasks)
{
if (dt.is_chain == 0)
{
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
await base[upInput];
}
}
}
}
/// <summary>
@@ -458,7 +484,6 @@ namespace Tnb.WarehouseMgr
#region PrivateMethods
private bool isArrivedEpoint = false;
private async Task<List<WmsPointH>> LocPathCalcAlgorithms(string pStartId, string pEndId, List<WmsRoad> roads)
{
var points = await _db.Queryable<WmsPointH>().ToListAsync();