Skip to content

D
DataCenter_Core2.1_20190520
Commit b38ef787 by guanzhenshan
Options

修复每日销进比汇总的显示问题

parent b0653191
Showing with 33 additions and 6 deletions
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
......@@ -790,10 +790,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
objSC = new SkuCategory_Col
{
category_simple_name = item.category_simple_name,
list = new List<string> { }
list = new List<string> { },
days = new List<string> { }
};
//objSC.list.Add(item.day);
objSC.days.Add(item.day);
objSC.list.Add((t == 1 ? item.amount_purchase : item.amount_putin).ToString());
objSC.list.Add((t == 1 ? item.count_purchase : item.count_putin).ToString());
objSC.list.Add((t == 1 ? item.amount_sales : item.amount_shipping).ToString());
......@@ -814,11 +816,32 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
else
{
objSC.list.Add(item.day);
objSC.list.Add((t == 1 ? item.amount_purchase : item.amount_putin).ToString());
objSC.list.Add((t == 1 ? item.count_purchase : item.count_putin).ToString());
objSC.list.Add((t == 1 ? item.amount_sales : item.amount_shipping).ToString());
objSC.list.Add((t == 1 ? item.count_sales : item.count_shipping).ToString());
//objSC.list.Add(item.day);
//objSC.list.Add((t == 1 ? item.amount_purchase : item.amount_putin).ToString());
//objSC.list.Add((t == 1 ? item.count_purchase : item.count_putin).ToString());
//objSC.list.Add((t == 1 ? item.amount_sales : item.amount_shipping).ToString());
//objSC.list.Add((t == 1 ? item.count_sales : item.count_shipping).ToString());
if (!objSC.days.Contains(item.day))
{
objSC.days.Add(item.day);
objSC.list.Add((t == 1 ? item.amount_purchase : item.amount_putin).ToString());
objSC.list.Add((t == 1 ? item.count_purchase : item.count_putin).ToString());
objSC.list.Add((t == 1 ? item.amount_sales : item.amount_shipping).ToString());
objSC.list.Add((t == 1 ? item.count_sales : item.count_shipping).ToString());
objSC.list.Add((t == 1 ? (item.amount_purchase - item.amount_sales) : (item.amount_putin - item.amount_shipping)).ToString());
objSC.list.Add((t == 1 ? (item.count_purchase - item.count_sales) : (item.count_putin - item.count_shipping)).ToString());
}
else
{
objSC.list[objSC.list.Count - 6] = (decimal.Parse(objSC.list[objSC.list.Count - 6]) + ((t == 1 ? item.amount_purchase : item.amount_putin))).ToString("G0");
objSC.list[objSC.list.Count - 5] = (decimal.Parse(objSC.list[objSC.list.Count - 5]) + (t == 1 ? item.count_purchase : item.count_putin)).ToString("G0");
objSC.list[objSC.list.Count - 4] = (decimal.Parse(objSC.list[objSC.list.Count - 4]) + (t == 1 ? item.amount_sales : item.amount_shipping)).ToString("G0");
objSC.list[objSC.list.Count - 3] = (decimal.Parse(objSC.list[objSC.list.Count - 3]) + (t == 1 ? item.count_sales : item.count_shipping)).ToString("G0");
objSC.list[objSC.list.Count - 2] = (decimal.Parse(objSC.list[objSC.list.Count - 2]) + (t == 1 ? (item.amount_purchase - item.amount_sales) : (item.amount_putin - item.amount_shipping))).ToString("G0");
objSC.list[objSC.list.Count - 1] = (decimal.Parse(objSC.list[objSC.list.Count - 1]) + (t == 1 ? (item.count_purchase - item.count_sales) : (item.count_putin - item.count_shipping))).ToString("G0");
}
if (head.Where(a => a.Contains(item.day)).Count() <= 0)
{
......@@ -829,6 +852,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
head.Add(item.day + (dateWay == 3 ? "月" : "") + "差异金额");
head.Add(item.day + (dateWay == 3 ? "月" : "") + "差异数量");
}
}
}
......@@ -1042,6 +1066,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
public string category_simple_name { get; set; }
public List<string> days { get; set; }
public List<string> list { get; set; }
}
}
\ No newline at end of file
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