Commit fb28e93e by guanzhenshan

解决管理成本 广州电子服装仓利息明细不对的问题

parent de43b8c2
...@@ -1005,7 +1005,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1005,7 +1005,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var listInterest = new List<Models.Api.mInterestExpense>(); var listInterest = new List<Models.Api.mInterestExpense>();
if (paycompanyid.HasValue && paycompanyid.Value>0) if (paycompanyid.HasValue && paycompanyid.Value>0 && paycompanyid.Value==1)
{ {
cwurl += "&CompanyVal=" + paycompanyid.Value; cwurl += "&CompanyVal=" + paycompanyid.Value;
} }
...@@ -1014,6 +1014,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1014,6 +1014,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
//利息支出 //利息支出
listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl); listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
if (paycompanyid.HasValue && paycompanyid.Value > 0 && paycompanyid.Value != 1) //如果不是广州百伦的,则汇总显示为电子仓的
{
listInterest = listInterest.Where(a => a.CompanyVal != 1).ToList();
}
} }
if (listInterest.Count > 0) if (listInterest.Count > 0)
...@@ -1047,7 +1052,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1047,7 +1052,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var listInterest = new List<Models.Api.mInterestExpense>(); var listInterest = new List<Models.Api.mInterestExpense>();
if (paycompanyid.HasValue && paycompanyid.Value > 0) if (paycompanyid.HasValue && paycompanyid.Value > 0 && paycompanyid.Value == 1)
{ {
cwurl += "&CompanyVal=" + paycompanyid.Value; cwurl += "&CompanyVal=" + paycompanyid.Value;
} }
...@@ -1056,6 +1061,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1056,6 +1061,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
//利息支出 //利息支出
listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl); listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
if (paycompanyid.HasValue && paycompanyid.Value > 0 && paycompanyid.Value != 1) //如果不是广州百伦的,则汇总显示为电子仓的
{
listInterest = listInterest.Where(a => a.CompanyVal != 1).ToList();
}
} }
var colNames = new List<string> {"借入公司主体名称","借款帐号","借款银行名称", "借款银行持卡人", "债权方", var colNames = new List<string> {"借入公司主体名称","借款帐号","借款银行名称", "借款银行持卡人", "债权方",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment