|
@@ -56,7 +56,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
From Fin_PaymentRefundAndOtherMoney prom
|
|
From Fin_PaymentRefundAndOtherMoney prom
|
|
Left Join Sys_Users u On u.Id = prom.CreateUserId
|
|
Left Join Sys_Users u On u.Id = prom.CreateUserId
|
|
Left Join Sys_SetData sd On prom.CurrencyId = sd.Id
|
|
Left Join Sys_SetData sd On prom.CurrencyId = sd.Id
|
|
- Left Join Grp_CreditCardPayment ccp On ccp.CTable = 285 And ccp.CId = prom.Id
|
|
+ Left Join Grp_CreditCardPayment ccp On ccp.CTable = 98 And ccp.CId = prom.Id
|
|
Where prom.IsDel = 0 And u.IsDel = 0 And sd.IsDel = 0 And ccp.IsDel = 0
|
|
Where prom.IsDel = 0 And u.IsDel = 0 And sd.IsDel = 0 And ccp.IsDel = 0
|
|
And prom.DiId = {0}", diId);
|
|
And prom.DiId = {0}", diId);
|
|
|
|
|
|
@@ -194,7 +194,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
|
|
string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
|
|
ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
|
|
ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
|
|
From Fin_PaymentRefundAndOtherMoney prom
|
|
From Fin_PaymentRefundAndOtherMoney prom
|
|
- Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 79 And ccp.IsDel = 0
|
|
+ Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 98 And ccp.IsDel = 0
|
|
Where prom.IsDel = 0 And prom.Id = {0}", dto.Id);
|
|
Where prom.IsDel = 0 And prom.Id = {0}", dto.Id);
|
|
var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).ToListAsync();
|
|
var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).ToListAsync();
|
|
|
|
|
|
@@ -262,7 +262,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
return _result;
|
|
return _result;
|
|
}
|
|
}
|
|
|
|
|
|
- var teamReteData1 = teamReteDatas.Where(it => it.CTableId == 285).FirstOrDefault();
|
|
+ var teamReteData1 = teamReteDatas.Where(it => it.CTableId == 98).FirstOrDefault();
|
|
if (teamReteData1 == null)
|
|
if (teamReteData1 == null)
|
|
{
|
|
{
|
|
_result.Msg = "该团下的“其他款项”未设置团组汇率,请先设置!";
|
|
_result.Msg = "该团下的“其他款项”未设置团组汇率,请先设置!";
|
|
@@ -286,7 +286,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
|
|
|
|
|
|
|
|
DIId = dto.DiId,
|
|
DIId = dto.DiId,
|
|
- CTable = 285,
|
|
+ CTable = 98,
|
|
PayDId = dto.PayDId,
|
|
PayDId = dto.PayDId,
|
|
ConsumptionPatterns = dto.ConsumptionPatterns,
|
|
ConsumptionPatterns = dto.ConsumptionPatterns,
|
|
ConsumptionDate = string.Empty,
|
|
ConsumptionDate = string.Empty,
|
|
@@ -357,13 +357,12 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
}
|
|
}
|
|
else if (dto.Status == 2)
|
|
else if (dto.Status == 2)
|
|
{
|
|
{
|
|
- _PaymentRefundAndOtherMoney.Id = dto.Id;
|
|
|
|
_CreditCardPayment.Id = dto.CcpId;
|
|
_CreditCardPayment.Id = dto.CcpId;
|
|
_CreditCardPayment.CId = dto.Id;
|
|
_CreditCardPayment.CId = dto.Id;
|
|
|
|
|
|
_sqlSugar.BeginTran();
|
|
_sqlSugar.BeginTran();
|
|
|
|
|
|
- var prom_update = await _sqlSugar.Updateable(_PaymentRefundAndOtherMoney)
|
|
+ var prom_update = await _sqlSugar.Updateable(_CreditCardPayment)
|
|
.IgnoreColumns(it => new { it.CreateUserId, it.CreateTime, it.DeleteUserId, it.DeleteTime, it.IsDel })
|
|
.IgnoreColumns(it => new { it.CreateUserId, it.CreateTime, it.DeleteUserId, it.DeleteTime, it.IsDel })
|
|
.WhereColumns(it => new { it.Id })
|
|
.WhereColumns(it => new { it.Id })
|
|
.ExecuteCommandAsync();
|
|
.ExecuteCommandAsync();
|
|
@@ -400,7 +399,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- _result.Msg = "请输入正确的状态! 1 添加 2 修改;";
|
|
+ _result.Msg = "请输入正确的操作状态! 1 添加 2 修改;";
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|