Commit b1e6c9f4 by guanzhenshan

调整利息支出,改为从接口读取

parent 55c9f2a7
......@@ -389,7 +389,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//利息支出
var listInterest = new Services.FinanceReportServices().ListFinanceInterest(start,end,paycompanyid);//new Services.FinanceReportServices().ListInterestExpense(cwurl);
var listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
//Edit by Allan at 20191217 for 更改数据源
var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"",paycompanyid); //new Services.FinanceReportServices().ListOtherCost(url);
......@@ -499,18 +499,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//广州电子服装仓
var clothVal = 0.00M;
var objCloth = listInterest.Where(a => a.company_val != 1);
var objCloth = listInterest.Where(a => a.CompanyVal != 1);
if (objCloth.Count() > 0)
{
clothVal = objCloth.Sum(a => a.repay_interest_rmb);
clothVal = objCloth.Sum(a => a.RepayInterestRMB);
}
//广州百伦
var gzblVal = 0.00M;
var objGZBL = listInterest.Where(a => a.company_val == 1);
var objGZBL = listInterest.Where(a => a.CompanyVal == 1);
if (objGZBL.Count() > 0)
{
gzblVal = objGZBL.Sum(a => a.repay_interest_rmb);
gzblVal = objGZBL.Sum(a => a.RepayInterestRMB);
}
if (clothVal > 0 && clothindex == -1)
......@@ -641,7 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
}
var val = listInterest.Sum(a => a.repay_interest_rmb);
var val = listInterest.Sum(a => a.RepayInterestRMB);
if (index_Interest == -1 && val > 0)
{
......@@ -707,7 +707,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
msg = list.Count>0?"":"成本接口返回了空记录。",
col = listCol,
list = listValue,
amount = Math.Round(list.Sum(a=>a.amount_rmb)+ listInterest.Sum(a=>a.repay_interest_rmb), 2)
amount = Math.Round(list.Sum(a=>a.amount_rmb)+ listInterest.Sum(a=>a.RepayInterestRMB), 2)
});
}
......
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