Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2023-07-07 14:49:43 +08:00

View File

@@ -77,7 +77,15 @@ namespace Tnb.WarehouseMgr
carry.location_id = null;
carry.location_code = null;
await _db.Updateable(carry).UpdateColumns(it => new { it.location_id, it.location_code }).ExecuteCommandAsync();
WmsDistaskH? disTask = await _db.Queryable<WmsDistaskH>().SingleAsync(it => it.id == input.disTaskId);
WmsDistaskH? disTask = null;
if (!input.disTaskId.IsNullOrEmpty())
{
disTask = await _db.Queryable<WmsDistaskH>().SingleAsync(it => it.id == input.disTaskId);
}
else if (!input.carryId.IsNullOrEmpty())
{
disTask = await _db.Queryable<WmsDistaskH>().FirstAsync(it => it.carry_id == input.carryId && it.is_sign == 0);
}
if (disTask != null)
{
if (_dicBizType.ContainsKey(disTask.biz_type))