Skip to content

D
DataCenter_Core2.1_20190520
Commit f55e6e2b by guanzhenshan
Options

每日发生额增加按日显示的维度

parent 5ef2f0fb
Showing with 158 additions and 12 deletions
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -3028,17 +3028,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var startDay = first.day;
var endDay = first.day.AddDays((7 - (int)DayOfWeek));
var weekIndex = 0;
foreach (var item in obj)
{
if (item.day > endDay)
{
weekIndex++;
startDay = endDay.AddDays(1);
endDay = endDay.AddDays(7);
}
var m = list.OrderBy(a => a.type).ToList();
if (m.Count <= 0)
......@@ -3125,7 +3117,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
else
{
if (head.Where(a => a.Contains(item.day.ToString("MMdd"))).Count() > 0) //累加
//if (head.Where(a => a.Contains(item.day.ToString("MMdd"))).Count() > 0) //累加
if(startDay<=item.day && item.day<=endDay)
{
m[0].list[m[0].list.Count - 3] += (item.ac_amount_pay);
m[0].list[m[0].list.Count - 2] += (item.ac_amount_happen);
......@@ -3149,6 +3142,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
else //新增
{
startDay = endDay.AddDays(1);
endDay = endDay.AddDays(7);
m[0].list.Add(item.ac_amount_pay);
m[0].list.Add(item.ac_amount_happen);
......@@ -3310,6 +3305,140 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
}
}
else if (dateWay == 1)
{
foreach (var item in obj)
{
var m = list.OrderBy(a => a.type).ToList();
if (m.Count <= 0)
{
//管理成本
var m1 = new mHappenAmount
{
type = 1,
typename = "管理成本",
list = new List<decimal>(),
};
m1.list.Add(item.ac_amount_pay);
m1.list.Add(item.ac_amount_happen);
m1.list.Add(item.ac_amount_sales);
//头程物流
var m2 = new mHappenAmount
{
type = 2,
typename = "头程物流费",
list = new List<decimal>(),
};
m2.list.Add(item.hl_amount_pay);
m2.list.Add(item.hl_amount_happen);
m2.list.Add(item.hl_amount_sales);
//尾程物流
var m3 = new mHappenAmount
{
type = 3,
typename = "尾程物流费",
list = new List<decimal>()
};
m3.list.Add(0); //item.tl_amount_pay //头程和尾程物流费取值是一样的，只显示头程的物流付款数据
m3.list.Add(item.tl_amount_happen);
m3.list.Add(item.tl_amount_sales);
//一级供应商采购
var m4 = new mHappenAmount
{
type = 4,
typename = "一级供应商采购",
list = new List<decimal>()
};
m4.list.Add(item.tos_amount_pay);
m4.list.Add(item.tos_amount_happen);
m4.list.Add(item.tos_amount_sales);
//二级供应商采购
var m5 = new mHappenAmount
{
type = 5,
typename = "二级供应商采购",
list = new List<decimal>()
};
m5.list.Add(item.ss_amount_pay);
m5.list.Add(item.ss_amount_happen);
m5.list.Add(0); //item.ss_amount_sales 二级供应商采购销售额
list.Add(m1);
list.Add(m2);
list.Add(m3);
list.Add(m4);
list.Add(m5);
head.Add(item.day.ToString("MMdd") + "已付款统计");
head.Add(item.day.ToString("MMdd") + "发生额统计");
head.Add(item.day.ToString("MMdd") + "销售部分统计");
}
else
{
if (head.Where(a => a.Contains(item.day.ToString("MMdd"))).Count() > 0) //累加
{
m[0].list[m[0].list.Count - 3] += (item.ac_amount_pay);
m[0].list[m[0].list.Count - 2] += (item.ac_amount_happen);
m[0].list[m[0].list.Count - 1] += (item.ac_amount_sales);
m[1].list[m[1].list.Count - 3] += (item.hl_amount_pay);
m[1].list[m[1].list.Count - 2] += (item.hl_amount_happen);
m[1].list[m[1].list.Count - 1] += (item.hl_amount_sales);
//m[2].list[m[2].list.Count - 3] += (item.tl_amount_pay); //尾程物流费付款额
m[2].list[m[2].list.Count - 2] += (item.tl_amount_happen);
m[2].list[m[2].list.Count - 1] += (item.tl_amount_sales);
m[3].list[m[3].list.Count - 3] += (item.tos_amount_pay);
m[3].list[m[3].list.Count - 2] += (item.tos_amount_happen);
m[3].list[m[3].list.Count - 1] += (item.tos_amount_sales);
m[4].list[m[4].list.Count - 3] += (item.ss_amount_pay);
m[4].list[m[4].list.Count - 2] += (item.ss_amount_happen);
//m[4].list[m[4].list.Count - 1] += (item.ss_amount_sales); //二级供应商采购销售额
}
else //新增
{
m[0].list.Add(item.ac_amount_pay);
m[0].list.Add(item.ac_amount_happen);
m[0].list.Add(item.ac_amount_sales);
m[1].list.Add(item.hl_amount_pay);
m[1].list.Add(item.hl_amount_happen);
m[1].list.Add(item.hl_amount_sales);
m[2].list.Add(0); //item.tl_amount_pay 尾程物流费付款额
m[2].list.Add(item.tl_amount_happen);
m[2].list.Add(item.tl_amount_sales);
m[3].list.Add(item.tos_amount_pay);
m[3].list.Add(item.tos_amount_happen);
m[3].list.Add(item.tos_amount_sales);
m[4].list.Add(item.ss_amount_pay);
m[4].list.Add(item.ss_amount_happen);
m[4].list.Add(0); //item.ss_amount_sales 二级供应商采购销售额
head.Add(item.day.ToString("MMdd") + "已付款统计");
head.Add(item.day.ToString("MMdd") + "发生额统计");
head.Add(item.day.ToString("MMdd") + "销售部分统计");
}
}
}
}
if (list.Count > 0)
{
......@@ -3349,6 +3478,23 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
/// <summary>
/// 每日发生额明细
/// </summary>
/// <param name="start">开始日期</param>
/// <param name="end">结束日期</param>
/// <returns></returns>
public ActionResult ListHappenAmount(DateTime start,DateTime end)
{
ViewBag.start = start.ToString("yyyy-MM-dd");
ViewBag.end = end.ToString("yyyy-MM-dd");
return View();
}
#endregion
}
......
Bailun.DC.Web/Areas/Reports/Views/Finance/HappenAmountCount.cshtml
......@@ -16,7 +16,7 @@
<div class="form-group">
<label>日期方式：</label>
<select id="dateWay" name="dateWay" class="form-control">
@*<option value="1">按日</option>*@
<option value="1">按日</option>
<option value="2">按周</option>
<option value="3">按月</option>
</select>
......@@ -140,7 +140,7 @@
}
function showdetail(categoryname, colname) {
layer_show(categoryname +' '+ colname+' 的Sku明细', '@Url.Content("~/Reports/Warehouse/ListDailyPurchaseSales?categoryname=")' + categoryname + '&colname=' + colname + '&dateWay=' + $('#dateWay').val() + '&t=' + $('#t').val(), '90%', '90%');
//layer_show(categoryname +' '+ colname+' 的Sku明细', '@Url.Content("~/Reports/Warehouse/ListDailyPurchaseSales?categoryname=")' + categoryname + '&colname=' + colname + '&dateWay=' + $('#dateWay').val() + '&t=' + $('#t').val(), '90%', '90%');
}
function listwarehouse() {
......
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