Skip to content

D
DataCenter_Core2.1_20190520
Commit 807089e8 by guanzhenshan
Options

1、解决SKU报表加载不出来的问题 

2、调整SKU统计维度库存的更新频率，改为1小时更新一次
parent 09016f2f
Showing with 74 additions and 50 deletions
Bailun.DC.Models/dc_datawarehouse.cs
......@@ -188,5 +188,11 @@ namespace Bailun.DC.Models
/// sku 品牌
/// </summary>
public string skubrand { get; set; }
/// <summary>
/// 是否实际冗余
/// </summary>
public int? is_redundancy { get; set; }
}
}
Bailun.DC.Services/SkuInfoServices.cs
......@@ -43,12 +43,10 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = @"select t1.bailun_sku,t1.sku_image,t1.category_name,t1.sku_title_en,t1.sku_title_cn,sum(t2.usable_stock) usable_stock,(t2.usable_stock*t1.unit_price) amount_stock,sum(t3.quantity_purchase) quantity_purchase,sum(t3.quantity_purchase*t1.unit_price) purchase_amount,sum(t3.quantity_transfer) quantity_transfer,sum(t3.quantity_transfer*t1.unit_price) amount_transit,sum(t5.oneday_total_sales) oneday_total_sales,sum(t5.oneday_total_sales*t1.unit_price) amount_onedaysale,sum(t5.sevenday_total_sales) sevenday_total_sales,sum(t5.fourteenday_total_sales) fourteenday_total_sales,sum(t5.thirtyday_total_sales) thirtyday_total_sales ";
var sqlwhere = @"from dc_base_sku t1
left join dc_base_stock t2 on t1.bailun_sku=t2.bailun_sku
left join dc_mid_transit t3 on t1.bailun_sku=t3.bailun_sku
left join dc_daily_sales t5 on t1.bailun_sku =t5.bailun_sku and t5.record_date = DATE_SUB(curdate(),INTERVAL 1 DAY)
where 1=1 ";
var sql = @"select t1.bailun_sku,t2.sku_image,t2.category_name,t2.sku_title_en,t2.sku_title_cn,t1.count_stock as usable_stock,t1.amount_stock,t1.count_onway_purchase as quantity_purchase,t1.amount_onway_purchase as purchase_amount,t1.count_onway_allot as quantity_transfer,t1.amount_onway_allot as amount_transit,t1.one_day_sale_count as oneday_total_sales,t1.one_day_sale_amount as amount_onedaysale,t1.seven_day_sale_count as sevenday_total_sales,t1.fourteen_day_sale_count as fourteenday_total_sales,t1.thirty_day_sale_count as thirtyday_total_sales";
var sqlwhere = " from dc_mid_sku_statistics t1 join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku where 1=1 ";
if (!string.IsNullOrWhiteSpace(sku))
{
sqlwhere += " and t1.bailun_sku=@bailun_sku";
......@@ -56,19 +54,17 @@ namespace Bailun.DC.Services
}
if (!string.IsNullOrWhiteSpace(skuname))
{
sqlwhere += " and t1.sku_title_cn=@sku_title_cn";
sqlwhere += " and t2.sku_title_cn=@sku_title_cn";
sqlparam.Add("sku_title_cn", skuname);
}
sqlwhere += " group by t1.bailun_sku";
if (!string.IsNullOrWhiteSpace(parameter.sort))
{
sqlwhere += " order by " + parameter.sort + " " + parameter.order;
}
else
{
sqlwhere += " order by oneday_total_sales desc";
sqlwhere += " order by t1.count_stock desc";
}
......@@ -96,12 +92,11 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = @"select sum(t2.usable_stock) usable_stock,(t2.usable_stock*t1.unit_price) amount_stock,sum(t3.quantity_purchase) quantity_purchase,sum(t3.quantity_purchase*t1.unit_price) purchase_amount,sum(t3.quantity_transfer) quantity_transfer,sum(t3.quantity_transfer*t1.unit_price) amount_transit,sum(t5.oneday_total_sales) oneday_total_sales,sum(t5.oneday_total_sales*t1.unit_price) amount_onedaysale,sum(t5.sevenday_total_sales) sevenday_total_sales,sum(t5.fourteenday_total_sales) fourteenday_total_sales,sum(t5.thirtyday_total_sales) thirtyday_total_sales ";
var sqlwhere = @"from dc_base_sku t1
left join dc_base_stock t2 on t1.bailun_sku=t2.bailun_sku
left join dc_mid_transit t3 on t1.bailun_sku=t3.bailun_sku
left join dc_daily_sales t5 on t1.bailun_sku =t5.bailun_sku and t5.record_date = DATE_SUB(curdate(),INTERVAL 1 DAY)
where 1=1 ";
var sql = @"select sum(t1.count_stock) as usable_stock,sum(t1.amount_stock) as amount_stock,sum(t1.count_onway_purchase) as quantity_purchase,sum(t1.amount_onway_purchase) as purchase_amount,sum(t1.count_onway_allot) as quantity_transfer,sum(t1.amount_onway_allot) as amount_transit,sum(t1.one_day_sale_count) as oneday_total_sales,sum(t1.one_day_sale_amount) as amount_onedaysale,sum(t1.seven_day_sale_count) as sevenday_total_sales,sum(t1.fourteen_day_sale_count) as fourteenday_total_sales,sum(t1.thirty_day_sale_count) as thirtyday_total_sales from dc_mid_sku_statistics t1
join dc_base_sku t2 on t1.bailun_sku=t2.bailun_sku ";
var sqlwhere = " where 1=1 ";
if (!string.IsNullOrWhiteSpace(sku))
{
sqlwhere += " and t1.bailun_sku=@bailun_sku";
......@@ -109,7 +104,7 @@ namespace Bailun.DC.Services
}
if (!string.IsNullOrWhiteSpace(skuname))
{
sqlwhere += " and t1.sku_title_cn=@sku_title_cn";
sqlwhere += " and t2.sku_title_cn=@sku_title_cn";
sqlparam.Add("sku_title_cn", skuname);
}
......
Bailun.DC.Services/SkuMonitorServices.cs
......@@ -224,12 +224,12 @@ namespace Bailun.DC.Services
/// <param name="groupname"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_datawarehouse> List2(BtTableParameter parameter, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname,string skubrand, ref int total)
public List<dc_datawarehouse> List2(BtTableParameter parameter, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname,string skubrand,int? is_redundancy, ref int total)
{
var sqlparams = new DynamicParameters();
//var sql = "select t1.* from dc_datawarehouse t1 ";
var sql = $@"select t1.id,t1.groupname,t1.warehousetype,t1.warehousename,t1.sku,t1.categoryname,t1.skuname,t1.monitorstatus,t1.clearancestatus,t1.tortstatus,t1.str_skutag,t1.buyprice,(t2.usable_stock+t2.occupy_stock) as usable_stock,(t2.usable_stock+t2.occupy_stock)*t1.buyprice as amount_stock,t1.quantity_purchase,t1.purchase_amount,t1.quantity_transfer,t1.amount_transit,t1.quantity_unshipped,t1.quantity_out_stock,t1.oneday_total_sales,t1.sevenday_average_sales,t1.fourteenday_average_sales,t1.thirtyday_average_sales,t1.amount_sevendaysale,t1.skubrand
var sql = $@"select t1.id,t1.groupname,t1.warehousetype,t1.warehousename,t1.sku,t1.categoryname,t1.skuname,t1.monitorstatus,t1.clearancestatus,t1.tortstatus,t1.str_skutag,t1.buyprice,(t2.usable_stock+t2.occupy_stock) as usable_stock,(t2.usable_stock+t2.occupy_stock)*t1.buyprice as amount_stock,t1.quantity_purchase,t1.purchase_amount,t1.quantity_transfer,t1.amount_transit,t1.quantity_unshipped,t1.quantity_out_stock,t1.oneday_total_sales,t1.sevenday_average_sales,t1.fourteenday_average_sales,t1.thirtyday_average_sales,t1.amount_sevendaysale,t1.skubrand,t1.is_redundancy
from
dc_datawarehouse t1
join dc_base_stock t2 on t1.sku=t2.bailun_sku and t1.warehouse_code=t2.warehouse_code ";
......@@ -335,6 +335,12 @@ namespace Bailun.DC.Services
sqlparams.Add("skubrand", skubrand);
}
if (is_redundancy.HasValue)
{
sql += " and t1.is_redundancy=@is_redundancy";
sqlparams.Add("is_redundancy", is_redundancy.Value);
}
if (!string.IsNullOrEmpty(parameter.sort))
{
if (parameter.sort == "usable_stock")
......@@ -346,7 +352,6 @@ namespace Bailun.DC.Services
sql += " order by t1." + parameter.sort + " " + parameter.order;
}
}
else
{
......@@ -394,7 +399,7 @@ namespace Bailun.DC.Services
/// <param name="skucategory"></param>
/// <param name="searchkey"></param>
/// <returns></returns>
public dc_sku_monitor ListCount(string warehousetype,int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory,string skucategoryids, string searchkey,string groupname,string skubrand)
public dc_sku_monitor ListCount(string warehousetype,int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory,string skucategoryids, string searchkey,string groupname,string skubrand,int? is_redundancy)
{
var sqlparams = new DynamicParameters();
......@@ -505,6 +510,12 @@ namespace Bailun.DC.Services
sqlparams.Add("skubrand", skubrand);
}
if (is_redundancy.HasValue)
{
sql += " and t1.is_redundancy=@is_redundancy";
sqlparams.Add("is_redundancy", is_redundancy.Value);
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
......
Bailun.DC.SkuDataWareHouse/Program.cs
......@@ -7,21 +7,21 @@ namespace Bailun.DC.SkuDataWareHouse
{
class Program
{
static async Task Main(string[] args)
{
Console.WriteLine("进入 数据仓生成服务");
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//static async Task Main(string[] args)
//{
// Console.WriteLine("运行成功！");
// new Services().Save();
// Console.WriteLine("进入 数据仓生成服务");
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{
Console.WriteLine("运行成功！");
new Services().Save();
}
}
}
\ No newline at end of file
Bailun.DC.SkuDataWareHouse/Services.cs
......@@ -52,7 +52,7 @@ namespace Bailun.DC.SkuDataWareHouse
cn.Open();
}
cn.Execute("delete from dc_datawarehouse;", 5 * 60);
cn.Execute("truncate dc_datawarehouse;", 5 * 60);
var page = 1;
var pagesize = 8000;
......@@ -62,7 +62,7 @@ namespace Bailun.DC.SkuDataWareHouse
while (page == 1 || (resultcount == pagesize && resultcount != 0))
{
var strlimit = (((page - 1) * pagesize) + "," + pagesize);
var sql = $@"select t2.hq_type as warehousetype,t2.warehouse_name as warehousename,t2.warehouse_code,t1.bailun_sku as sku,t1.category_id,t1.categoryname,t1.sku_title_cn as skuname,(case when t4.status=1 then 0 else 1 end) monitorstatus,t5.clearancestatus,(case when t8.id is not null then 1 else 0 end) as tortstatus,t5.str_skutag,t1.unit_price as buyprice,t1.usable_stock,(t1.usable_stock*t1.unit_price) amount_stock,t6.quantity_purchase,(t6.quantity_purchase*t1.unit_price) as purchase_amount,t6.quantity_transfer,(t6.quantity_transfer*t1.unit_price) amount_transit,t6.quantity_out_stock,t7.oneday_total_sales,(t7.oneday_total_sales*t1.unit_price) as amount_onedaysale,t7.sevenday_total_sales,(t7.sevenday_total_sales*t1.unit_price) amount_sevendaysale,t7.fourteenday_total_sales,t7.thirtyday_total_sales,t7.sevenday_average_sales,t7.fourteenday_average_sales,t7.thirtyday_average_sales,t1.create_time as skucreatetime,t2.area_id,t2.area_name,t1.brand as skubrand
var sql = $@"select t2.hq_type as warehousetype,t2.warehouse_name as warehousename,t2.warehouse_code,t1.bailun_sku as sku,t1.category_id,t1.categoryname,t1.sku_title_cn as skuname,(case when t4.status=1 then 0 else 1 end) monitorstatus,t5.clearancestatus,(case when t8.id is not null then 1 else 0 end) as tortstatus,t5.str_skutag,t1.unit_price as buyprice,t1.usable_stock,(t1.usable_stock*t1.unit_price) amount_stock,t6.quantity_purchase,(t6.quantity_purchase*t1.unit_price) as purchase_amount,t6.quantity_transfer,(t6.quantity_transfer*t1.unit_price) amount_transit,t6.quantity_out_stock,t7.oneday_total_sales,(t7.oneday_total_sales*t1.unit_price) as amount_onedaysale,t7.sevenday_total_sales,(t7.sevenday_total_sales*t1.unit_price) amount_sevendaysale,t7.fourteenday_total_sales,t7.thirtyday_total_sales,t7.sevenday_average_sales,t7.fourteenday_average_sales,t7.thirtyday_average_sales,t1.create_time as skucreatetime,t2.area_id,t2.area_name,t1.brand as skubrand,(case when t9.id is not null then 1 else 0 end) as is_redundancy
from (select t01.bailun_sku,t01.warehouse_code,t01.usable_stock,t02.unit_price,t02.create_time,t02.bailun_category_id as category_id,t02.bailun_category_name as categoryname,t02.sku_title_cn,t02.brand from dc_base_stock t01
join dc_base_sku t02 on t01.bailun_sku=t02.bailun_sku and t02.company_id=1
limit {strlimit}) t1
......@@ -72,6 +72,7 @@ namespace Bailun.DC.SkuDataWareHouse
left join dc_mid_transit t6 on t1.bailun_sku=t6.bailun_sku and t1.warehouse_code=t6.warehouse_code
left join dc_daily_sales t7 on t7.record_date = DATE_SUB(curdate(),INTERVAL 1 DAY) and t1.bailun_sku=t7.bailun_sku and t7.warehouse_code=t1.warehouse_code
left join dc_base_tort t8 on t1.bailun_sku=t8.bailun_sku
left join dc_auto_forecast_fluctuation t9 on t1.bailun_sku=t9.bailun_sku and t1.warehouse_code=t9.warehouse_code and t9.type=3
";
......@@ -79,7 +80,7 @@ namespace Bailun.DC.SkuDataWareHouse
resultcount = liststock.AsList().Count;
var str = @"insert dc_datawarehouse (warehousetype,area_id,area_name,warehousename,warehouse_code,sku,category_id,categoryname,skuname,monitorstatus,clearancestatus,tortstatus,str_skutag,buyprice,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,quantity_out_stock,oneday_total_sales,amount_onedaysale,sevenday_total_sales,amount_sevendaysale,fourteenday_total_sales,thirtyday_total_sales,sevenday_average_sales,fourteenday_average_sales,thirtyday_average_sales,skucreatetime,lastupdatetime,skubrand) values ";
var str = @"insert dc_datawarehouse (warehousetype,area_id,area_name,warehousename,warehouse_code,sku,category_id,categoryname,skuname,monitorstatus,clearancestatus,tortstatus,str_skutag,buyprice,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,quantity_out_stock,oneday_total_sales,amount_onedaysale,sevenday_total_sales,amount_sevendaysale,fourteenday_total_sales,thirtyday_total_sales,sevenday_average_sales,fourteenday_average_sales,thirtyday_average_sales,skucreatetime,lastupdatetime,skubrand,is_redundancy) values ";
foreach (var item in liststock)
{
if (!string.IsNullOrEmpty(item.categoryname))
......@@ -87,7 +88,7 @@ namespace Bailun.DC.SkuDataWareHouse
item.categoryname = item.categoryname.Replace("'", "");
}
str += $@"('{item.warehousetype}','{item.area_id??0}','{item.area_name}','{item.warehousename}','{item.warehouse_code}','{item.sku}',{item.category_id??0},'{(!string.IsNullOrEmpty(item.categoryname) ? item.categoryname : "")}','{item.skuname.Replace("'", "")}',{item.monitorstatus??1},{item.clearancestatus??0},{item.tortstatus??0},'{item.str_skutag}',{item.buyprice??0},{item.usable_stock??0},{item.amount_stock??0},{item.quantity_purchase??0},{item.purchase_amount??0},{item.quantity_transfer??0},{item.amount_transit??0},{item.quantity_out_stock??0},{item.oneday_total_sales??0},{item.amount_onedaysale??0},{item.sevenday_total_sales??0},{item.amount_sevendaysale??0},{item.fourteenday_total_sales??0},{item.thirtyday_total_sales??0},{item.sevenday_average_sales??0},{item.fourteenday_average_sales??0},{item.thirtyday_average_sales??0},'{(item.skucreatetime.HasValue?item.skucreatetime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"1970-01-01")}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{item.skubrand.Replace("'","''")}'),";
str += $@"('{item.warehousetype}','{item.area_id??0}','{item.area_name}','{item.warehousename}','{item.warehouse_code}','{item.sku}',{item.category_id??0},'{(!string.IsNullOrEmpty(item.categoryname) ? item.categoryname : "")}','{item.skuname.Replace("'", "")}',{item.monitorstatus??1},{item.clearancestatus??0},{item.tortstatus??0},'{item.str_skutag}',{item.buyprice??0},{item.usable_stock??0},{item.amount_stock??0},{item.quantity_purchase??0},{item.purchase_amount??0},{item.quantity_transfer??0},{item.amount_transit??0},{item.quantity_out_stock??0},{item.oneday_total_sales??0},{item.amount_onedaysale??0},{item.sevenday_total_sales??0},{item.amount_sevendaysale??0},{item.fourteenday_total_sales??0},{item.thirtyday_total_sales??0},{item.sevenday_average_sales??0},{item.fourteenday_average_sales??0},{item.thirtyday_average_sales??0},'{(item.skucreatetime.HasValue?item.skucreatetime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"1970-01-01")}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{item.skubrand.Replace("'","''")}',{(item.is_redundancy??0)}),";
}
if (resultcount > 0)
{
......
Bailun.DC.SkuStatistics/Services.cs
......@@ -28,7 +28,7 @@ namespace Bailun.DC.SkuStatistics
{
var now = DateTime.Now;
if (now.Minute % 10 == 0) //每10分钟同步一次
if (now.Minute == 1) //每10分钟同步一次
{
UpdateStock();
UpdateOnWay();
......
Bailun.DC.Web/Areas/Reports/Controllers/InventoryController.cs
......@@ -45,14 +45,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="skucategory"></param>
/// <param name="searchkey"></param>
/// <returns></returns>
public string DataWareHouseJson(Models.BtTableParameter request, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey,string skucategoryids,string groupname,string skubrand)
public string DataWareHouseJson(Models.BtTableParameter request, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey,string skucategoryids,string groupname,string skubrand,int? is_redundancy)
{
var service = new Services.SkuMonitorServices();
var total = 0;
//var obj = service.List(request, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids,groupname, ref total);
var obj = service.List2(request, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids, groupname, skubrand,ref total);
var obj = service.List2(request, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids, groupname, skubrand, is_redundancy, ref total);
var countM = new Models.dc_sku_monitor();//service.ListCount(warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, skucategoryids, searchkey,groupname);
......@@ -92,7 +92,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
groupname = string.IsNullOrEmpty(p.groupname)?"":p.groupname.Trim(),
quantity_unshipped = p.quantity_unshipped??0,
p.skubrand
p.skubrand,
is_redundancy = (p.is_redundancy.HasValue&&p.is_redundancy.Value==1?"是":"否")
});
return JsonConvert.SerializeObject(new { total = total, rows = list,count_row = new {
......@@ -120,10 +121,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【数据仓】->【查询】页面",0)]
public JsonResult DataWareHouseCountJson(Models.BtTableParameter request, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname,string skubrand)
public JsonResult DataWareHouseCountJson(Models.BtTableParameter request, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname,string skubrand,int? is_redundancy)
{
var service = new Services.SkuMonitorServices();
var countM = service.ListCount(warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, skucategoryids, searchkey, groupname,skubrand);
var countM = service.ListCount(warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, skucategoryids, searchkey, groupname,skubrand, is_redundancy);
countM.skuname = "总计：";
......@@ -153,20 +154,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
public ActionResult ExportDataWarehouse(string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname, string skubrand)
public ActionResult ExportDataWarehouse(string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname, string skubrand,int? is_redundancy)
{
var service = new Services.SkuMonitorServices();
var total = 0;
//var obj = service.List(request, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids,groupname, ref total);
var obj = service.List2(new Models.BtTableParameter { offset = 0, limit = 0 }, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids, groupname, skubrand, ref total);
var obj = service.List2(new Models.BtTableParameter { offset = 0, limit = 0 }, warehousetype, areaid, warehousecode, start, end, monitorstatus, cleanstatus, infringestatus, skutip, storestart, storeend, skucategory, searchkey, skucategoryids, groupname, skubrand, is_redundancy, ref total);
var colNames = new List<string> { "分组名称","仓库类型", "仓库名称", "sku", "产品分类","品牌"
,"中文名称","监控状态","清货状态","侵权状态","SKU标签"
,"采购价","库存数量","库存金额","采购在途数量","采购在途金额"
,"调拨在途数量","调拨在途金额","待发货数量","缺货数量","昨日销量"
,"近七日日均销量","近十四日均销量","近三十日均销量","7天总销售额"};
,"近七日日均销量","近十四日均销量","近三十日均销量","7天总销售额","是否冗余"};
var list = new List<string>();
......@@ -176,7 +177,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
item.skuname + "|" +((item.monitorstatus)==1?"正在监控":"停止监控") + "|"+ ((item.clearancestatus)==1?"正在清货":"否") + "|" +((item.tortstatus)==1?"已侵权":"否") + "|" +item.str_skutag + "|" +
item.buyprice + "|" +(item.usable_stock??0) + "|" +(item.amount_stock??0) + "|" +(item.quantity_purchase??0) + "|" +(item.purchase_amount??0) + "|" +
(item.quantity_transfer??0) + "|" +(item.amount_transit??0) + "|" +(item.quantity_unshipped??0) + "|" +(item.quantity_out_stock??0) + "|" +(item.oneday_total_sales??0) + "|" +
(item.sevenday_average_sales??0) + "|" +(item.fourteenday_average_sales??0) + "|" +(item.thirtyday_average_sales??0) + "|" + (item.amount_sevendaysale??0)
(item.sevenday_average_sales??0) + "|" +(item.fourteenday_average_sales??0) + "|" +(item.thirtyday_average_sales??0) + "|" + (item.amount_sevendaysale??0)+"|"+(item.is_redundancy.HasValue && item.is_redundancy.Value==1?"是":"否")
;
list.Add(str);
......
Bailun.DC.Web/Areas/Reports/Views/Inventory/DataWareHouse.cshtml
......@@ -71,6 +71,14 @@
</select>
</div>
<div class="form-group">
<select id="is_redundancy" name="is_redundancy" class="form-control">
<option value="">实际冗余状态不限</option>
<option value="1">是冗余</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group">
<select id="skutip" name="skutip" class="form-control">
<option value="">Sku标签不限</option>
<option value="耗材">耗材</option>
......@@ -253,6 +261,7 @@
{ field: 'status', title: '监控状态', width: '100', sortable: true },
{ field: 'clearancestatus', title: '清货状态', width: '100', sortable: true },
{ field: 'tortstatus', title: '侵权状态', width: '100', sortable: true },
{ field: 'is_redundancy', title: '是否冗余', width: '110', sortable: true },
{ field: 'str_skutag', title: 'sku标签', width: '120', sortable: true },
{ field: 'buyprice', title: '采购价', width: '100', sortable: true },
{ field: 'usable_stock', title: '库存数量', width: '110', sortable: true, iscount: true },
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main()
{
#if DEBUG
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTkwMjUwMDUsImV4cCI6MTU5OTA2MTAwNSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk5MDI1MDA1LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.X74jEyTmS1QlY7WLKfUps7z2vnyiQq0LhIc17K10C94zqv0F1ovgwddafZT03Kd_noXgLR19erdtGE7htYsxhGqf0uz_G1xllALOw_zbZK0J9LV-RA6a74-lVmBEl-lbLDMLgKDshySGQcn4A-Y9WwccPSgUivaBJjCaTZqGN5mJJAQuv1ofERkRFPEqTAnXo2bID5os80y8hxe8TeckX-9hBJqRIx-9p9zMPY9DU-sa9h1vdGj-_9n2ZtJXHvnvZ90Myi_9WtNrHnhpMNJBgkswfucVV4EnGis8wN7ZLzx8BBoCQ8BwWwYFdyJozG2lvV82Dmhq8N8-EbTqfS78fA";
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTkxMTQyMDQsImV4cCI6MTU5OTE1MDIwNCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk5MTE0MjA0LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.MxAXGhWVE1q2sGtvo_Clpqe9CtaTyA6OrvvV9dCoCwDeiaB5Fvx3SGwmY_kLFkpShxw9m9LptwZMKucys9lBiFa1pe_TU32o1SxeIaAqsucDqqaiiQt1tJZ1_IGJjF1DAKFBejTgJG_2zNuq3rJsv1C_CCz7tDodeuwy3p5KyS8TQOdqb3QqgrOX-O3xMofqrv0HHRwqD_WLK_YahwUXqSA4CzxIKlscxmPWrfI7RGVthG-hwRkhzvYGapqDeEWZuQrb-WrKuERhnSsqcAwPA2aheuWtA3r01SI00zlNMBSodoGMX0zYwAvRvbPQZCgSJUAnoYAK7_ydTtZ0wSmNjA";
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
......
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