Skip to content

D
DataCenter_Core2.1_20190520
Commit c528bfa8 by guanzhenshan
Options

解决平台利润统计报表按发货时间没有显示数据的问题

parent 229e415f
Showing with 43 additions and 22 deletions
Bailun.DC.LogicWareHouse/Program.cs
......@@ -7,32 +7,32 @@ namespace Bailun.DC.LogicWareHouse
{
class Program
{
static async Task Main(string[] args)
{
Console.WriteLine("进入 逻辑仓库");
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
//static async Task Main(string[] args)
//{
// Console.WriteLine("进入 逻辑仓库");
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
await builder.RunConsoleAsync();
}
// await builder.RunConsoleAsync();
//}
//static void Main(string[] args)
//{
// var _service = new Services();
static void Main(string[] args)
{
var _service = new Services();
// _service.Save();
_service.Save();
// //半成品销量
// //_service.UpdateSemiSale();
//半成品销量
//_service.UpdateSemiSale();
// //更新半成品销量和现金流
// //_service.UpdateLogicWareHouseSemiSale();
//更新半成品销量和现金流
//_service.UpdateLogicWareHouseSemiSale();
// //保存每日数据快照
// //_service.SaleWHDailySnaps();
//}
//保存每日数据快照
//_service.SaleWHDailySnaps();
}
}
}
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -1809,9 +1809,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
result = _service.ListPlatformProfitByShipTime(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, null, null, null,statistictype, skunewcategory);
if(platform.Trim()=="FBA")
if (platform == "FBA" || string.IsNullOrEmpty(platform))
{
var fbaResult = _service.ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", website, null, null, null, null, currency.ToUpper() == "USD", companyid, skucategoryids, shipstart, shipend);
var fbaResult = _service.ListPlatformProfit("FBA", website, null, null, null, null, currency.ToUpper() == "USD", companyid, skucategoryids, shipstart, shipend);
result.AddRange(fbaResult);
}
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListWareHouseSku.cshtml
......@@ -194,9 +194,15 @@
field: 'quantity_tuneout_30days', title: '30天调出数', width: '130', sortable: true
},
{
field: 'amount_tuneout_30days', title: '30天调出金额', width: '150', sortable: true
},
{
field: 'quantity_tunein_30days', title: '30天调入数', width: '130', sortable: true, iscount: true
},
{
field: 'amount_tunein_30days', title: '30天调入金额', width: '130', sortable: true, iscount: true
},
{
field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '昨日总销量' + '\',1,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.oneday_total_sales + '</a>' : data.oneday_total_sales);
}
......@@ -210,16 +216,31 @@
}
},
{
field: 'sevenday_total_sales_amount', title: '七天销售额', width: '100', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '七天销售额' + '\',7,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.sevenday_total_sales_amount + '</a>' : data.sevenday_total_sales_amount);
}
},
{
field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '十四天销量' + '\',14,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.fourteenday_total_sales + '</a>' : data.fourteenday_total_sales);
}
},
{
field: 'fourteenday_total_sales_amount', title: '十四天销售额', width: '120', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '十四天销售额' + '\',14,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.fourteenday_total_sales_amount + '</a>' : data.fourteenday_total_sales_amount);
}
},
{
field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '三十天销量' + '\',30,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.thirtyday_total_sales + '</a>' : data.thirtyday_total_sales);
}
},
{
field: 'thirtyday_total_sales_amount', title: '三十天销售额', width: '130', sortable: true, formatter: function (idx, data) {
return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '三十天销售额' + '\',30,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.thirtyday_total_sales_amount + '</a>' : data.thirtyday_total_sales_amount);
}
},
{
field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\',\'' + data.bailun_sku + '\')">' + data.cash_in_30days + '</a>';
}
......
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