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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-07-13 09:17:32 +08:00
parent f474f40135 9c4b032f0f
commit 35df665c73
5 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs
View File

@@ -16,6 +16,6 @@ namespace Tnb.WarehouseMgr.Interfaces
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public Task MESCarrySign(MESCarrySignInput input);
public Task<dynamic> MESCarrySign(MESCarrySignInput input);
}
}

4
WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
View File

@@ -94,6 +94,10 @@ namespace Tnb.WarehouseMgr
{
disTask = await _db.Queryable<WmsDistaskH>().FirstAsync(it => it.carry_id == input.carryId && it.is_sign == 0);
}
else if (!input.carry_code.IsNullOrEmpty())
{
disTask = await _db.Queryable<WmsDistaskH>().FirstAsync(it => it.carry_code == input.carry_code && it.is_sign == 0);
}
if (disTask != null)
{
if (_dicBizType.ContainsKey(disTask.biz_type))