Skip to content

D
DataCenter_Core2.1_20190520
Commit 04fc998f by guanzhenshan
Options

1、完成接入新用户验证 

2、利润统计报表按发货时间增加FBA发货数据
3、解决数据中心帐号余额导入出错的问题
parent eba59f23
Showing with 261 additions and 227 deletions
Bailun.DC.Services/OrdersServices.cs
...@@ -987,7 +987,7 @@ namespace Bailun.DC.Services ...@@ -987,7 +987,7 @@ namespace Bailun.DC.Services
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend,bool isUSD) public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend,bool isUSD, int companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*"+(isUSD? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*"+ (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb "; var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*"+(isUSD? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*"+ (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb ";
...@@ -997,7 +997,8 @@ namespace Bailun.DC.Services ...@@ -997,7 +997,8 @@ namespace Bailun.DC.Services
sql += " left join dc_base_oms_pick t1 on tb.bailun_order_id =t1.bailun_order_id "; sql += " left join dc_base_oms_pick t1 on tb.bailun_order_id =t1.bailun_order_id ";
} }
sql += " where tb.bailun_order_status!='Canceled' and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0"; sql += " where tb.bailun_order_status!='Canceled' and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 ";
//sql += " and tb.company_id=" + companyid; //按公司区分
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
...@@ -1051,7 +1052,7 @@ namespace Bailun.DC.Services ...@@ -1051,7 +1052,7 @@ namespace Bailun.DC.Services
/// <param name="shipstart">发货开始时间</param> /// <param name="shipstart">发货开始时间</param>
/// <param name="shipend">发货结束时间</param> /// <param name="shipend">发货结束时间</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD) public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD,int companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb "; var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb ";
...@@ -1070,9 +1071,13 @@ namespace Bailun.DC.Services ...@@ -1070,9 +1071,13 @@ namespace Bailun.DC.Services
sql += " and shipping_time<'"+shipend.Value.AddDays(1).ToString("yyyy-MM-dd")+"'"; sql += " and shipping_time<'"+shipend.Value.AddDays(1).ToString("yyyy-MM-dd")+"'";
} }
sql += " group by bailun_order_id) t2 on tb.bailun_order_id=t2.bailun_order_id "; //sql += " company_id="+companyid; //按公司区分
sql += " group by bailun_order_id ";
sql += " ) t2 on tb.bailun_order_id=t2.bailun_order_id ";
sql += " where tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 "; sql += " where tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 ";
//sql += " and tb.company_id=" + companyid; //按公司区分
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
...@@ -2511,11 +2516,11 @@ namespace Bailun.DC.Services ...@@ -2511,11 +2516,11 @@ namespace Bailun.DC.Services
if (start.HasValue) if (start.HasValue)
{ {
sql += " and paid_time_site>='" + start.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'"; sql += " and paid_time>='" + start.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'";
} }
if (end.HasValue) if (end.HasValue)
{ {
sql += " and paid_time_site<'" + end.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'"; sql += " and paid_time<'" + end.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'";
} }
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
{ {
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
...@@ -389,7 +389,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -389,7 +389,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
if (t == 2) //按付款主体 if (t == 2) //按付款主体
{ {
listCol = list.GroupBy(a => a.companyName).Select(p => p.Key).ToList(); listCol = list.GroupBy(a => a.companyName).Select(p => p.Key).OrderBy(a=>a).ToList();
} }
else //按部门 else //按部门
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
...@@ -6,6 +6,10 @@ using Microsoft.AspNetCore.Mvc; ...@@ -6,6 +6,10 @@ using Microsoft.AspNetCore.Mvc;
using Bailun.DC.Models; using Bailun.DC.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Bailun.ServiceFabric.Authorize;
using Bailun.ServiceFabric.Core.Extension.HttpContext;
using Bailun.ServiceFabric.Core.Extension;
using Bailun.ServiceFabric.Extension;
namespace Bailun.DC.Web.Areas.Reports.Controllers namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
...@@ -42,6 +46,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -42,6 +46,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns> /// <returns></returns>
public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode) public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account,warehousetype,warehousecode, ref total); var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account,warehousetype,warehousecode, ref total);
...@@ -577,15 +583,21 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -577,15 +583,21 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
[HttpPost] [HttpPost]
public JsonResult PlatformProfitCountJson(string platform,DateTime? start,DateTime? end,DateTime? shipstart,DateTime? shipend,string currency) public JsonResult PlatformProfitCountJson(string platform,DateTime? start,DateTime? end,DateTime? shipstart,DateTime? shipend,string currency)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var result = new List<Models.Orders.dc_base_oms_sku>(); var result = new List<Models.Orders.dc_base_oms_sku>();
if (shipstart.HasValue || shipend.HasValue) if (shipstart.HasValue || shipend.HasValue)
{ {
result = new Services.OrdersServices().ListPlatformProfitByShipTime(platform, start, end, shipstart, shipend, currency.ToUpper() == "USD"); result = new Services.OrdersServices().ListPlatformProfitByShipTime(platform, start, end, shipstart, shipend, currency.ToUpper() == "USD",companyid??0);
var fbaResult = new Services.OrdersServices().ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", shipstart, shipend, null, null, currency.ToUpper() == "USD", companyid ?? 0);
result.AddRange(fbaResult);
} }
else else
{ {
result = new Services.OrdersServices().ListPlatformProfit(platform, start, end, shipstart, shipend,currency.ToUpper()=="USD"); result = new Services.OrdersServices().ListPlatformProfit(platform, start, end, shipstart, shipend,currency.ToUpper()=="USD",companyid??0);
} }
if (result.Count > 0) if (result.Count > 0)
...@@ -1012,6 +1024,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1012,6 +1024,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns> /// <returns></returns>
public string EbaySaleStatisticsJson(BtTableParameter parameter, string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode) public string EbaySaleStatisticsJson(BtTableParameter parameter, string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var services = new Services.OrdersServices(); var services = new Services.OrdersServices();
var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Ebay").FirstOrDefault(); var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Ebay").FirstOrDefault();
......
Bailun.DC.Web/Bailun.DC.Web.csproj
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Bailun.ServiceFabric.Authorize" Version="1.0.3" />
<PackageReference Include="Bailun.ServiceFabric.Core" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
<PackageReference Include="NPOI" Version="2.4.1" /> <PackageReference Include="NPOI" Version="2.4.1" />
......
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bailun.ServiceFabric.Authorize;
using Bailun.ServiceFabric.Core.Extension;
using Bailun.ServiceFabric.Core.Extension.HttpContext;
using Bailun.ServiceFabric.Extension;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace Bailun.DC.Web.Controllers namespace Bailun.DC.Web.Controllers
...@@ -97,33 +101,21 @@ namespace Bailun.DC.Web.Controllers ...@@ -97,33 +101,21 @@ namespace Bailun.DC.Web.Controllers
return Json(result); return Json(result);
} }
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost] [HttpPost]
public JsonResult GetUserInfo(string acc) public JsonResult GetUserInfo()
{ {
var strResult = Common.HttpHelper.NetHelper.HttpPost(ConfigHelper.GetByName("GetUser"), "BLUserAcct=" + acc + "&webcode=wuliu"); var userid = HttpContextHelper.Current?.User?.GetUid().ToStr();
var username = HttpContextHelper.Current.User.GetUserName();
try var jobs = ""; //HttpContextHelper.Current.User.GetRolesCode();
{ var companyid = HttpContextHelper.Current.User.GetCompanyId();
var obj = Newtonsoft.Json.Linq.JObject.Parse(strResult);
if (obj["code"].ToString() != "0")
{
return Json(new
{
success = true,
userid = Convert.ToInt32(obj["data"]["UserId"].ToString().Trim()),
username = obj["data"]["UserName"].ToString().Trim(),
jobs = obj["data"]["Jobs"].ToString().Trim()
});
}
}
catch
{
}
return Json(new return Json(new
{ {
success = false success = true,
userid = userid,
username = username,
jobs = jobs
}); });
} }
......
Bailun.DC.Web/Pages/Index.cshtml
...@@ -30,10 +30,13 @@ ...@@ -30,10 +30,13 @@
<script src="css/hplus/js/jquery.min.js?v=2.1.4"></script> <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script> <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<script src="~/js/common.js" type="text/javascript"></script> <script src="~/js/common.js?20190606001" type="text/javascript"></script>
</head> </head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
<script type="text/javascript">
login();
</script>
<div id="wrapper"> <div id="wrapper">
<!--左侧导航开始--> <!--左侧导航开始-->
<nav class="navbar-default navbar-static-side" role="navigation"> <nav class="navbar-default navbar-static-side" role="navigation">
...@@ -53,232 +56,232 @@ ...@@ -53,232 +56,232 @@
</a> </a>
</div> </div>
</li> </li>
<li>
<a href="#">
<i class="fa fa-pie-chart"></i>
<span class="nav-label">库存</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li> <li>
<a href="#"> <a href="#">
<i class="fa fa-pie-chart"></i> <i class="fa fa-refresh"></i>
<span class="nav-label">库存</span> <span class="nav-label">库存周转报表</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-third-level">
<li> <li>
<a href="#"> <a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/DataWareHouse")" data-index="0" style="padding-left:74px;">
<i class="fa fa-refresh"></i> <span class="nav-label">数据仓</span>
<span class="nav-label">库存周转报表</span>
<span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/DataWareHouse")" data-index="0" style="padding-left:74px;">
<span class="nav-label">数据仓</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/WarehouseSaleReport")" data-index="0" style="padding-left:74px;">
<span class="nav-label">数据仓销量分析</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Warehouse/LogicWarehouse")" data-index="0" style="padding-left:74px;">逻辑仓库</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Sku/ListSku")" data-index="0" style="padding-left:74px;">Sku</a>
</li>
</ul>
</li> </li>
<li> <li>
<a href="#"> <a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/WarehouseSaleReport")" data-index="0" style="padding-left:74px;">
<i class="fa fa-refresh"></i> <span class="nav-label">数据仓销量分析</span>
<span class="nav-label">库存财务报表</span>
<span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/SkuInventory")" data-index="0" style="padding-left:74px;">
<span class="nav-label">Sku库存分析报表</span>
</a>
</li>
</ul>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Warehouse/WarehouseRedundancy")" data-index="0">仓库库存分析报表</a> <a class="J_menuItem" href="@Url.Content("~/Reports/Warehouse/LogicWarehouse")" data-index="0" style="padding-left:74px;">逻辑仓库</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Sku/ListSku")" data-index="0" style="padding-left:74px;">Sku</a>
</li> </li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="#"> <a href="#">
<i class="fa fa-list"></i> <i class="fa fa-refresh"></i>
<span class="nav-label">订单</span> <span class="nav-label">库存财务报表</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-third-level">
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Purchase/ListPurchase")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Inventory/SkuInventory")" data-index="0" style="padding-left:74px;">
<span>采购单</span> <span class="nav-label">Sku库存分析报表</span>
</a> </a>
</li> </li>
</ul>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Warehouse/WarehouseRedundancy")" data-index="0">仓库库存分析报表</a>
</li>
</ul>
</li>
<li>
<a href="#">
<i class="fa fa-list"></i>
<span class="nav-label">订单</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Purchase/ListPurchase")" data-index="0">
<span>采购单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Allot/ListAllot")" data-index="0">
<span>调拨单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/SkuOrderList")" data-index="0">
<span>非fba销售订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASkuOrderList")" data-index="0">
<span>fba销售订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/OrderSaleCount")" data-index="0">
<span>订单汇总</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/OrderRefundDetails")" data-index="0">
<span>退款单明细</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/DepositReceived")" data-index="0">
<span>预收款明细</span>
</a>
</li>
</ul>
</li>
<li>
<a href="#">
<i class="fa fa-bar-chart"></i>
<span class="nav-label">统计</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li>
<a href="javascript:;">
<i class="fa fa-money"></i>
<span class="nav-label">亚马逊</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-third-level">
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Allot/ListAllot")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/AmazonSaleStatistics")" data-index="0" style="padding-left:74px;">
<span>调拨单</span> <span>非FBA销售统计</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/SkuOrderList")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASaleStatistics")" data-index="0" style="padding-left:74px;">
<span>非fba销售订单</span> <span>FBA销售统计</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASkuOrderList")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>fba销售订单</span> <span>订单流水</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/OrderSaleCount")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FinanceFee?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>订单汇总</span> <span>财务费用</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/OrderRefundDetails")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBAAbnormalOrder")" data-index="0" style="padding-left:74px;">
<span>退款单明细</span> <span>FBA异常订单</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/DepositReceived")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformFeeAbnormal?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>预收款明细</span> <span>平台费异常订单</span>
</a> </a>
</li> </li>
</ul>
</li>
<li>
<a href="#">
<i class="fa fa-bar-chart"></i>
<span class="nav-label">统计</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li>
<a href="javascript:;">
<i class="fa fa-money"></i>
<span class="nav-label">亚马逊</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/AmazonSaleStatistics")" data-index="0" style="padding-left:74px;">
<span>非FBA销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASaleStatistics")" data-index="0" style="padding-left:74px;">
<span>FBA销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FinanceFee?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>财务费用</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBAAbnormalOrder")" data-index="0" style="padding-left:74px;">
<span>FBA异常订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformFeeAbnormal?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>平台费异常订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Amazon")" data-index="0" style="padding-left:74px;">
<span>自发货平台费用流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=FBA")" data-index="0" style="padding-left:74px;">
<span>FBA平台费用流水</span>
</a>
</li>
</ul>
</li>
<li> <li>
<a href="javascript:;"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Amazon")" data-index="0" style="padding-left:74px;">
<i class="fa fa-money"></i> <span>自发货平台费用流水</span>
<span class="nav-label">Ebay</span>
<span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbaySaleStatistics")" data-index="0" style="padding-left:74px;">
<span>Ebay销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbayStatisticsByWebsite")" data-index="0" style="padding-left:74px;">
<span>Ebay站点销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Ebay")" data-index="0" style="padding-left:74px;">
<span>Ebay平台费用流水</span>
</a>
</li>
</ul>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformProfitCount")" data-index="0"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=FBA")" data-index="0" style="padding-left:74px;">
<i class="fa fa-money"></i> <span>FBA平台费用流水</span>
<span>平台利润统计</span>
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="#"> <a href="javascript:;">
<i class="fa fa-usd"></i> <i class="fa fa-money"></i>
<span class="nav-label">财务报表</span> <span class="nav-label">Ebay</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-third-level">
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/Index2")" data-index="0">资产负债表</a> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbaySaleStatistics")" data-index="0" style="padding-left:74px;">
<span>Ebay销售统计</span>
</a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/ListAccoutBalanceCount")" data-index="0">平台余额</a> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbayStatisticsByWebsite")" data-index="0" style="padding-left:74px;">
<span>Ebay站点销售统计</span>
</a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/DailySalesCount")" data-index="0">每日销售额</a> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/AdministrativeCost")" data-index="0">管理成本报表</a> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Ebay")" data-index="0" style="padding-left:74px;">
<span>Ebay平台费用流水</span>
</a>
</li> </li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="#"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformProfitCount")" data-index="0">
<i class="fa fa-usd"></i> <i class="fa fa-money"></i>
<span class="nav-label">数据分析</span> <span>平台利润统计</span>
<span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Logistics/Home/EbayUkReport")" data-index="0">EbayUK平邮比例</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Sku/ListSkuDiffWeigh")" data-index="0">Sku发货重量差异</a>
</li>
</ul>
</li> </li>
</ul> </ul>
</div> </li>
<li>
<a href="#">
<i class="fa fa-usd"></i>
<span class="nav-label">财务报表</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/Index2")" data-index="0">资产负债表</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/ListAccoutBalanceCount")" data-index="0">平台余额</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/DailySalesCount")" data-index="0">每日销售额</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Finance/AdministrativeCost")" data-index="0">管理成本报表</a>
</li>
</ul>
</li>
<li>
<a href="#">
<i class="fa fa-usd"></i>
<span class="nav-label">数据分析</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Logistics/Home/EbayUkReport")" data-index="0">EbayUK平邮比例</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Sku/ListSkuDiffWeigh")" data-index="0">Sku发货重量差异</a>
</li>
</ul>
</li>
</ul>
</div>
</nav> </nav>
<!--左侧导航结束--> <!--左侧导航结束-->
<!--右侧部分开始--> <!--右侧部分开始-->
...@@ -332,7 +335,7 @@ ...@@ -332,7 +335,7 @@
</div> --> </div> -->
</div> </div>
<!--右侧部分结束--> <!--右侧部分结束-->
</div> </div>
<script src="css/hplus/js/bootstrap.min.js?v=3.3.6"></script> <script src="css/hplus/js/bootstrap.min.js?v=3.3.6"></script>
<script src="css/hplus/js/plugins/metisMenu/jquery.metisMenu.js"></script> <script src="css/hplus/js/plugins/metisMenu/jquery.metisMenu.js"></script>
...@@ -341,6 +344,5 @@ ...@@ -341,6 +344,5 @@
<script src="css/hplus/js/hplus.min.js?v=4.1.0"></script> <script src="css/hplus/js/hplus.min.js?v=4.1.0"></script>
<script type="text/javascript" src="css/hplus/js/contabs.min.js"></script> <script type="text/javascript" src="css/hplus/js/contabs.min.js"></script>
<script src="css/hplus/js/plugins/pace/pace.min.js"></script> <script src="css/hplus/js/plugins/pace/pace.min.js"></script>
</body> </body>
</html> </html>
Bailun.DC.Web/Pages/Shared/_MainLayout.cshtml
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script> <script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script> <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<!--常用js方法--> <!--常用js方法-->
<script src="/js/common.js?=201903011812"></script> <script src="/js/common.js?=20190606001"></script>
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
<script type="text/javascript"> <script type="text/javascript">
......
Bailun.DC.Web/Pages/Shared/_MainLayout2.cshtml
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<!--下拉选择搜索控件--> <!--下拉选择搜索控件-->
<script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script> <script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script>
<!--常用js方法--> <!--常用js方法-->
<script src="/css/js/common.js?=201801251445"></script> <script src="/css/js/common.js?=20190606001"></script>
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
<script type="text/javascript"> <script type="text/javascript">
......
Bailun.DC.Web/Startup.cs
...@@ -2,12 +2,16 @@ using System; ...@@ -2,12 +2,16 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bailun.ServiceFabric.Core.Extension.HttpContext;
using Bailun.ServiceFabric.Extension;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
namespace Bailun.DC.Web namespace Bailun.DC.Web
{ {
...@@ -34,7 +38,7 @@ namespace Bailun.DC.Web ...@@ -34,7 +38,7 @@ namespace Bailun.DC.Web
//services.AddSession(); //services.AddSession();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
...@@ -77,7 +81,10 @@ namespace Bailun.DC.Web ...@@ -77,7 +81,10 @@ namespace Bailun.DC.Web
name: "default", name: "default",
template: "{controller=Home}/{action=Index}/{id?}"); template: "{controller=Home}/{action=Index}/{id?}");
}); });
ConfigManagerConf.SetConfiguration(Configuration);
app.UseStaticHttpContext();
} }
} }
} }
Bailun.DC.Web/appsettings.json
...@@ -11,5 +11,9 @@ ...@@ -11,5 +11,9 @@
"rootFilePath": "C:\\WebSite\\DataCenter-NetCore2", "rootFilePath": "C:\\WebSite\\DataCenter-NetCore2",
"LoginUrl": "http://www.bailuntec.com/Login/Index?guid=dbc0cffc7f4d11e8a4ca246e96754d42", "LoginUrl": "http://www.bailuntec.com/Login/Index?guid=dbc0cffc7f4d11e8a4ca246e96754d42",
"LoginOutUrl": "http://www.bailuntec.com/Login/LoginOut", "LoginOutUrl": "http://www.bailuntec.com/Login/LoginOut",
"GetUser": "http://www.bailuntec.com/Login/GetUserByBLUserAcct" "GetUser": "http://www.bailuntec.com/Login/GetUserByBLUserAcct",
"AppSetting": {
"SsoUrl": "http://sso.bailuntec.com", //֤url
"AuthType": "" //Ƿdebugģʽ
}
} }
Bailun.DC.Web/wwwroot/js/common.js
var baseUrl = 'http://data.bailuntec.com/'; var baseUrl = 'http://localhost:59628/';
var globalOrderSort=''; var globalOrderSort='';
var globalOrderType = ''; var globalOrderType = '';
...@@ -211,11 +211,14 @@ $.submit = function (data) { ...@@ -211,11 +211,14 @@ $.submit = function (data) {
url: data.url, url: data.url,
type: data.type||'GET', type: data.type||'GET',
data: data.paramData, data: data.paramData,
beforeSend: function () { beforeSend: function (request) {
if (!data.noloading) if (!data.noloading)
{ {
//load_index = layer.load(); //load_index = layer.load();
} }
request.setRequestHeader("Authorization", $.cookie("token"));
}, },
success: function (result) { success: function (result) {
try { try {
...@@ -298,31 +301,37 @@ function numFormat(num) { ...@@ -298,31 +301,37 @@ function numFormat(num) {
} }
function login() { function login() {
var useracc = $.cookie('BLUserAcct'); var token = getUrlParam('token');
//useracc = "4DF8961A9925E5F930133BB9235E605D4028EC3AA22DF07934EBDF7837FCBB9AC7D7B73BF50EF3B8B0B39499EFE2B0776303D6177B439F52B2781CD19831235EE5800ADB5B0770479A89E6DF7BA71D84|4DF8961A9925E5F925E15FBFCF682CAFA7CE698D19B44E255990FC4BF53934C8E87F5463597DB55AEE88A69634CB5A5FE25B58A53DE2651717042F901222BBD828E8ABA3401F54262493AA27D2E9383D0A097B881DF74984932FE6D929A706C0B0280272C4EDB089A66F2A11012E0C5CC19E7F0DF4490C8AF34AC401B4709A4AC9C10DF18923EF3DFE31F49C7E970031ED90B215F31D9CAE166DD59D87F5D1E60955AB383BE1F84F611D8B3C71247748D6F212472D44BB853F4935180429A01961CEFC8F7A528AE14BB1B4B987F4E337";
if (useracc == undefined || useracc == null) { if (token != '') {
window.location = "http://www.bailuntec.com/Login/Index?guid=dbc0cffc7f4d11e8a4ca246e96754d42"; $.cookie('token', token, { expires: 1 });
} }
else { else {
$.submit({ token = $.cookie('token');
type:'POST',
url: baseUrl+'Home/GetUserInfo?acc=' + useracc,
paramData: '',
func: function (result) {
if (result.success) {
userid = result.userid;
username = result.username;
jobs = result.jobs;
$('#user-job').html(jobs); if (token == undefined) {
$('#user-name').html(username); window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
return false;
}
}
$.submit({
type:'POST',
url: baseUrl+'Home/GetUserInfo',
paramData: '',
func: function (result) {
if (result.success) {
userid = result.userid;
username = result.username;
jobs = result.jobs;
$('#user-job').html(jobs);
$('#user-name').html(username);
}
else {
window.location = "http://www.bailuntec.com/Login/Index?guid=dbc0cffc7f4d11e8a4ca246e96754d42";
}
} }
}) else {
} window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
}
}
})
} }
//login();
\ 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