diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index b5bbe325..0732bbeb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -341,20 +341,24 @@ namespace Tnb.WarehouseMgr { Logger.LogInformation($"【CarryCodeUnbindWithoutTran】不使用事务"); } - int row = await db.Deleteable().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().Where(r => r.carry_id == input.carry_id).AnyAsync()) { - Logger.LogInformation($"【CarryUnbindWithoutTran】提交事务"); - await db.Ado.CommitTranAsync(); + int row = await db.Deleteable().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().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().Where(r => r.carry_id == input.carry_id).AnyAsync()) + { + int row = await db.Deleteable().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 {