Skip to content

D
DataCenter_Core2.1_20190520
Commit cf7d18bd by guanzhenshan
Options

解决手续费显示不对的问题；增加资产负债表任务可视化页面

parent 8fc4a583
Showing with 64 additions and 83 deletions
Bailun.DC.Services/FinanceReportServices.cs
...@@ -751,7 +751,7 @@ namespace Bailun.DC.Services ...@@ -751,7 +751,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public List<dc_base_finance_handlefee> ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid) public List<dc_base_finance_handlefee> ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid)
{ {
var sql = $"select * from dc_base_finance_handlefee where has_delete=0 and create_time>='{start.ToString("yyyy-MM-dd")}' and create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'"; var sql = $"select * from dc_base_finance_handlefee where subject_value_from in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) and has_delete=0 and create_time>='{start.ToString("yyyy-MM-dd")}' and create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
if (paycompanyid.HasValue && paycompanyid.Value > 0) if (paycompanyid.HasValue && paycompanyid.Value > 0)
{ {
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
...@@ -467,6 +467,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -467,6 +467,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
} }
/// <summary> /// <summary>
/// 资产负债表任务启动情况
/// </summary>
/// <returns></returns>
public ActionResult BalanceSheetTask()
{
return View();
}
/// <summary>
/// 资产负债表任务可视化数据
/// </summary>
/// <returns></returns>
[HttpPost]
public JsonResult BalanceSheetTaskJson()
{
return Json(new { });
}
/// <summary>
/// 供应商应付款详情 /// 供应商应付款详情
/// </summary> /// </summary>
/// <param name="date">日期</param> /// <param name="date">日期</param>
...@@ -851,101 +872,42 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -851,101 +872,42 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if (listHandleFee.Count > 0) if (listHandleFee.Count > 0)
{ {
var obj = listValue.Where(a => a.Item1 == "手续费支出").FirstOrDefault(); var obj = listValue.Where(a => a.Item1 == "手续费支出").FirstOrDefault();
var index_Interest_h = -1;
if (t == 2) //按付款主体 if (obj == null)
{ {
var gogirlindex_h = -1; //广州歌戈儿生活科技有限公司 var _list = new List<decimal>();
var gogirlindexarr_h = new List<int>(); //广州歌戈儿 相关付款主体 for (var j = 0; j < listCol.Count; j++)
var clothindex_h = -1;
for (var i = 0; i < listCol.Count; i++)
{
if (listCol[i] == "广州电子服装仓")
{
clothindex_h = i;
}
if (listCol[i] == "广州百伦供应链科技有限公司")
{
index_Interest_h = i;
}
if (listCol[i] == "广州歌戈儿生活科技有限公司")
{
gogirlindex_h = i;
}
else if (listCol[i].Contains("歌戈儿"))
{
gogirlindexarr_h.Add(i);
}
}
//广州电子服装仓
var clothVal = 0.00M;
var objCloth = listHandleFee.Where(a => a.subject_value_from != 1);
if (objCloth.Count() > 0)
{
clothVal = objCloth.Sum(a => a.pay_money_rMB);
}
//广州百伦
var gzblVal = 0.00M;
var objGZBL = listHandleFee.Where(a => a.subject_value_from == 1);
if (objGZBL.Count() > 0)
{ {
gzblVal = objGZBL.Sum(a => a.pay_money_rMB); _list.Add(0);
} }
if (clothVal > 0 && clothindex_h == -1) listValue.Add(new Tuple<string, List<decimal>>("手续费支出", _list));
{
listCol.Add("广州电子服装仓");
clothindex_h = listCol.Count - 1;
foreach (var item in listValue) obj = listValue.Where(a => a.Item1 == "手续费支出").FirstOrDefault();
{ }
item.Item2.Add(0);
}
} if (t == 2) //按付款主体
if (gzblVal > 0 && index_Interest_h == -1) {
var gogirlindex_h = -1; //广州歌戈儿生活科技有限公司
var gogirlindexarr_h = new List<int>(); //广州歌戈儿 相关付款主体
for (var i = 0; i < listCol.Count; i++)
{ {
listCol.Add("广州百伦供应链科技有限公司");
index_Interest_h = listCol.Count - 1;
foreach (var item in listValue) var objHandleFee = new decimal(0);
if (listCol[i].Contains("歌戈儿"))
{ {
item.Item2.Add(0); objHandleFee = listHandleFee.Where(a => a.subject_name_from.Contains("歌戈儿"))?.Sum(a => a.pay_money_rMB) ?? 0;
} }
} else
if (obj == null)
{
var _list = new List<decimal>();
for (var j = 0; j < listCol.Count; j++)
{ {
if (j == clothindex_h) objHandleFee = listHandleFee.Where(a => a.subject_name_from == listCol[i])?.Sum(a => a.pay_money_rMB) ?? 0;
{
_list.Add(clothVal);
}
else if (j == index_Interest_h)
{
_list.Add(gzblVal);
}
else
{
_list.Add(0);
}
} }
listValue.Add(new Tuple<string, List<decimal>>("手续费支出", _list)); obj.Item2[i] += objHandleFee;
}
else
{
obj.Item2[clothindex_h] = clothVal;
obj.Item2[index_Interest_h] = gzblVal;
} }
//Add by Allan at 201907091500 //Add by Allan at 201907091500
//合并广州歌戈儿相关付款主体到 广州歌戈儿生活科技有限公司 //合并广州歌戈儿相关付款主体到 广州歌戈儿生活科技有限公司
if (gogirlindexarr_h.Count > 0) if (gogirlindexarr_h.Count > 0)
...@@ -1014,9 +976,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1014,9 +976,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
} }
} }
//End Add //End Add
} }
else //按部门 else //按部门
{ {
var index_Interest_h = 0;
for (var i = 0; i < listCol.Count; i++) for (var i = 0; i < listCol.Count; i++)
{ {
if (listCol[i] == "财务部") if (listCol[i] == "财务部")
......
Bailun.DC.Web/Areas/Reports/Views/Finance/BalanceSheetTask.cshtml 0 → 100644

@{
ViewData["Title"] = "资产负债表任务运行情况";
}
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -54,16 +54,24 @@ namespace Bailun.DC.Web.Controllers ...@@ -54,16 +54,24 @@ namespace Bailun.DC.Web.Controllers
return View(); return View();
} }
public ActionResult Main() public ActionResult Main()
{ {
#if DEBUG
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImUxNjJjZjFhMjViZmRjNWY5ODZkZmJiMjY2ZWQ5YzNlIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1ODk1MjI5MDYsImV4cCI6MTU4OTU1ODkwNiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTg5NTIyOTA2LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn1dIiwiRGVwYXJ0bWVudCI6IntcIkRlcGFydG1lbnRJZFwiOjI1OCxcIk5hbWVcIjpcIuaVsOaNruS4reW_g1wiLFwiQ29kZVwiOlwiXCJ9Iiwic2NvcGUiOlsib3BlbmlkIiwicHJvZmlsZSIsImJhaWx1bkFwaSJdLCJhbXIiOlsiY3VzdG9tIl19.PfQEJTeO_pvi65oO6mrA3JRuAxItWEMPuPIdR9-A1ENUOBTMj_E9NS9h6th2qarHn37TLHCqa0odnZWdx6r29vQbmDdLExPUh7KpM6YkRZMtSlioUR2GnSTI4gxao4f6D1Q-ROTp37FNXz3QR4Dxv1UZz263YEFZY837tMNfwhXT7zvxtuX8nyfQCbvWWxJqmhH6PLb8l0llcGJX58mcm3r_BuZUbhjoDF48JfB2Yh9rti3wjmopHSx3mb3S2GLBN4aS4hyMyJ0bRCUWhoHuQGVKiqelJlacYB5hJM1PIPUuHm1eqSDJIWUuBj1WBgZlUNQSx8FpgQOsW9FZOmwLqA";
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
#endif
var companyid = -1; var companyid = -1;
var departmentname = ""; var departmentname = "";
var username = ""; var username = "";
var userid = 0; var userid = 0;
var isAllCompany = 0; var isAllCompany = 0;
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource",new string[] { "Authorization" },new string[] { (cookie != null ? cookie : "")}); var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource",new string[] { "Authorization" },new string[] { (cookie != null ? cookie : "")});
var json = Newtonsoft.Json.Linq.JObject.Parse(user); var json = Newtonsoft.Json.Linq.JObject.Parse(user);
......
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