Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
This commit is contained in:
@@ -341,20 +341,24 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】不使用事务");
|
||||
}
|
||||
int row = await db.Deleteable<WmsCarryD>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
|
||||
//isOk = row > 0;
|
||||
|
||||
//if (!isOk)
|
||||
//{
|
||||
// throw new Exception($"料架id{input.carry_id}载具解绑失败");
|
||||
//}
|
||||
Logger.LogInformation($"【CarryUnbindWithoutTran】料架{carry.carry_code}已解绑,解绑条数{row}");
|
||||
|
||||
|
||||
if (tranFlag)
|
||||
if (await db.Queryable<WmsCarryD>().Where(r => r.carry_id == input.carry_id).AnyAsync())
|
||||
{
|
||||
Logger.LogInformation($"【CarryUnbindWithoutTran】提交事务");
|
||||
await db.Ado.CommitTranAsync();
|
||||
int row = await db.Deleteable<WmsCarryD>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
|
||||
//isOk = row > 0;
|
||||
|
||||
//if (!isOk)
|
||||
//{
|
||||
// throw new Exception($"料架id{input.carry_id}载具解绑失败");
|
||||
//}
|
||||
Logger.LogInformation($"【CarryUnbindWithoutTran】料架{carry.carry_code}已解绑,解绑条数{row}");
|
||||
|
||||
|
||||
if (tranFlag)
|
||||
{
|
||||
Logger.LogInformation($"【CarryUnbindWithoutTran】提交事务");
|
||||
await db.Ado.CommitTranAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -416,19 +420,23 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】不使用事务");
|
||||
}
|
||||
int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
|
||||
if (tranFlag)
|
||||
{
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】提交事务");
|
||||
await db.Ado.CommitTranAsync();
|
||||
}
|
||||
isOk = row > 0;
|
||||
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】载具{carry.carry_code}已解绑,解绑条数{row}");
|
||||
//if (!isOk)
|
||||
//{
|
||||
// throw Oops.Oh(ErrorCode.COM1001);
|
||||
//}
|
||||
if (await db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.carry_id).AnyAsync())
|
||||
{
|
||||
int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
|
||||
if (tranFlag)
|
||||
{
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】提交事务");
|
||||
await db.Ado.CommitTranAsync();
|
||||
}
|
||||
isOk = row > 0;
|
||||
|
||||
Logger.LogInformation($"【CarryCodeUnbindWithoutTran】载具{carry.carry_code}已解绑,解绑条数{row}");
|
||||
//if (!isOk)
|
||||
//{
|
||||
// throw Oops.Oh(ErrorCode.COM1001);
|
||||
//}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user