Commit 759b6e03 by 泽锋 李

新增自动设置默认头程方式的服务

parent f60ee6b3
......@@ -518,7 +518,7 @@ and not exists ( select * from dc_auto_shortage_push_not_config where dc_auto_sh
sql += $" and not exists ( select * from dc_auto_shortage_push where dc_auto_shortage_push.warehouse_code = t1.warehouse_code and dc_auto_shortage_push.bailun_sku = t1.bailun_sku and dc_auto_shortage_push.`type`=1 and dc_auto_shortage_push.platform='{platform}' and dc_auto_shortage_push.has_return_goods=0 ) ";
}
// ebay 的 10月新品 +普货全量推
if (platform=="ebay")
if (platform == "ebay")
{
if (is_all)
{
......@@ -1058,24 +1058,27 @@ end
/// <returns></returns>
public static dynamic GetSalesTrendYear(string product_type)
{
var btime = DateTime.Parse( DateTime.Now.AddYears(-1).ToString("yyyy-01-01 00:00:00"));
var etime = DateTime.Parse( btime.ToString("yyyy-12-31 23:59:59"));
var btime = DateTime.Parse(DateTime.Now.AddYears(-1).ToString("yyyy-01-01 00:00:00"));
var etime = DateTime.Parse(btime.ToString("yyyy-12-31 23:59:59"));
// 查询基础数据
var base_datas = _connection.Query<dc_report_sales_trend_year>(" select * from dc_report_sales_trend_year where `date`>=@btime and `date`<=@etime and warehouse_type!='耗材仓' ", new {
var base_datas = _connection.Query<dc_report_sales_trend_year>(" select * from dc_report_sales_trend_year where `date`>=@btime and `date`<=@etime and warehouse_type!='耗材仓' ", new
{
btime = btime,
etime = etime
});
var months = new List<int> { 1,2,3,4,5,6,7,8,9,10,11,12};
var legendGroups = base_datas.GroupBy(s => new { s.country_code ,s.warehouse_type}).ToList();
return new {
var months = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
var legendGroups = base_datas.GroupBy(s => new { s.country_code, s.warehouse_type }).ToList();
return new
{
title = "年度销量趋势表",
legendDatas = legendGroups.Select(s=>$"{s.Key.warehouse_type}-{s.Key.country_code}" ),
xAxisDatas = months.Select(s=>$"{s}月"),
seriesDatas = legendGroups.Select(s=>new {
legendDatas = legendGroups.Select(s => $"{s.Key.warehouse_type}-{s.Key.country_code}"),
xAxisDatas = months.Select(s => $"{s}月"),
seriesDatas = legendGroups.Select(s => new
{
name = $"{s.Key.warehouse_type}-{s.Key.country_code}",
type = "line",
data = months.Select(m=> s.Where(b=>b.date.Month==m ).Sum(su=>su.sales))
data = months.Select(m => s.Where(b => b.date.Month == m).Sum(su => su.sales))
})
};
}
......@@ -1099,7 +1102,7 @@ end
return ReturnGoodsPushWish(platform);
}
List<string> rule1 = new List<string> { "GBYKD", "JZHYBLGC", "MDBLWYT", "MXBLWYT", "BLUSGDC", "GBBMHBL", "GB4PXBL", "DEBLDG", "USGCBL", "USHWBL", "US4PXBL", "AUWYTBL", "AU4PXBL", "GBWYTUK", "GBLQST" };
List<string> ch_rule1 = new List<string>(){ "GZBLWH", "BLGZ03"};
List<string> ch_rule1 = new List<string>() { "GZBLWH", "BLGZ03" };
var shortage_list = new List<dc_return_goods_push>();
// 回货速改推送
......@@ -1169,7 +1172,7 @@ end
{
sql += " and t1.has_return_goods=0 ";
}
shortage_list.AddRange(_connection.Query<dc_return_goods_push>(sql, new { platform = platform,rule1 = rule1, ch_rule1 = ch_rule1 }, commandTimeout: 0));
shortage_list.AddRange(_connection.Query<dc_return_goods_push>(sql, new { platform = platform, rule1 = rule1, ch_rule1 = ch_rule1 }, commandTimeout: 0));
return shortage_list;
......@@ -1545,46 +1548,46 @@ alter table dc_view_stock_monitor_sku_temp rename dc_view_stock_monitor_sku;
alter table dc_view_stock_monitor_skuTemp rename dc_view_stock_monitor_sku_temp;
truncate table dc_view_stock_monitor_sku_temp; ", commandTimeout: 0);
// _connection.Execute(@" -- 刷新sku汇总
//set session transaction isolation level read uncommitted;
//start transaction;
//-- 清空视图表的数据
//Truncate table dc_base_sku_sum_temp;
//insert into dc_base_sku_sum_temp(`bailun_sku`,
// `usable_stock`,
// `on_the_way`,
// `stock_amount`,
// `on_the_way_amount` ,
// `history_sevenday_sales`,
// `history_fourteenday_sales`,
// `history_thirtyday_sales`)
// (
// select t1.bailun_sku,sum(t1.usable_stock) as 'usable_stock',sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
//sum(ifnull(t1.usable_stock,0) * ifnull(t2.unit_price,0)) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',
//AVG(ifnull(t8.history_sevenday_sales,0)) as 'history_sevenday_sales',AVG(ifnull(t8.history_fourteenday_sales,0)) as 'history_fourteenday_sales',AVG(ifnull(t8.history_thirtyday_sales,0)) as 'history_thirtyday_sales'
//from
//dc_base_stock as t1
//left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku
//left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
//left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
//left join dc_auto_turnover as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
//group by t1.bailun_sku
// );
//alter table dc_base_sku_sum rename dc_base_sku_sumTemp;
//alter table dc_base_sku_sum_temp rename dc_base_sku_sum;
//alter table dc_base_sku_sumTemp rename dc_base_sku_sum_temp;
//truncate table dc_base_sku_sum_temp;
//", commandTimeout: 0);
// _connection.Execute(@" -- 刷新sku汇总
//set session transaction isolation level read uncommitted;
//start transaction;
//-- 清空视图表的数据
//Truncate table dc_base_sku_sum_temp;
//insert into dc_base_sku_sum_temp(`bailun_sku`,
// `usable_stock`,
// `on_the_way`,
// `stock_amount`,
// `on_the_way_amount` ,
// `history_sevenday_sales`,
// `history_fourteenday_sales`,
// `history_thirtyday_sales`)
// (
// select t1.bailun_sku,sum(t1.usable_stock) as 'usable_stock',sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
//sum(ifnull(t1.usable_stock,0) * ifnull(t2.unit_price,0)) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',
//AVG(ifnull(t8.history_sevenday_sales,0)) as 'history_sevenday_sales',AVG(ifnull(t8.history_fourteenday_sales,0)) as 'history_fourteenday_sales',AVG(ifnull(t8.history_thirtyday_sales,0)) as 'history_thirtyday_sales'
//from
//dc_base_stock as t1
//left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku
//left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
//left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
//left join dc_auto_turnover as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
//group by t1.bailun_sku
// );
//alter table dc_base_sku_sum rename dc_base_sku_sumTemp;
//alter table dc_base_sku_sum_temp rename dc_base_sku_sum;
//alter table dc_base_sku_sumTemp rename dc_base_sku_sum_temp;
//truncate table dc_base_sku_sum_temp;
//", commandTimeout: 0);
_connection.Execute(@" -- 刷新sku汇总
set session transaction isolation level read uncommitted;
......@@ -1783,7 +1786,7 @@ truncate table dc_base_oms_sku_outofstock_temp; ", commandTimeout: 0);
Console.WriteLine(ex.Message);
Console.WriteLine(ex.StackTrace);
}
}
/// <summary>
......@@ -2076,7 +2079,7 @@ truncate table dc_base_oms_sku_7_temp; ", new { time = DateTime.Now.AddDays(-8)
_connection.Execute(@"update dc_auto_jit_inventory as t1,
dc_auto_turnover as t2
set t1.safe_stock = t2.history_fourteenday_sales * 2,date = now()
where t1.bailun_sku =t2.bailun_sku and t1.warehouse_code =t2.warehouse_code",commandTimeout:0);
where t1.bailun_sku =t2.bailun_sku and t1.warehouse_code =t2.warehouse_code", commandTimeout: 0);
}
//刷新上周的数据
public static void ResetLastweekData()
......@@ -2106,7 +2109,7 @@ GROUP BY t1.bailun_sku,t1.warehouse_code ", new { btime = DateTime.Now.AddDays(-
_connection.Insert<dc_base_lastweek_data_temp>(item);
}
}
_connection.Execute(@"
alter table dc_base_lastweek_data rename dc_base_lastweek_dataTemp;
alter table dc_base_lastweek_data_temp rename dc_base_lastweek_data;
......@@ -2726,7 +2729,7 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
}
if (search_data != null)
{
if (!string.IsNullOrWhiteSpace(search_data.platform_type))
{
if ("amazon".Equals(search_data.platform_type, StringComparison.OrdinalIgnoreCase))
......@@ -2758,7 +2761,7 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
}
}
var oms_sku_list = _connection.Query<dc_base_oms_sku_label>(sql, parameters);
var stock_list = _connection.Query<dc_daily_stock_warehouse>(stock_sql, parameters_sql,commandTimeout:0);
var stock_list = _connection.Query<dc_daily_stock_warehouse>(stock_sql, parameters_sql, commandTimeout: 0);
List<bailun_sku_warehouse_code_dto> datas = new List<bailun_sku_warehouse_code_dto>();
......@@ -2814,7 +2817,7 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
}
var this_time = b_time;
while (this_time >= e_time)
{
......@@ -2833,8 +2836,8 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
day = this_time.Day,
count = temp_datas.Sum(s => s.bailun_sku_quantity_ordered),
sum = temp_datas.Sum(s => s.bailun_sku_quantity_ordered * s.amount_sales * s.order_to_usd_exchange_rate),
stock = stock_list.Where(v=>v.warehouse_code== item.warehouse_code && v.record_time.Year == this_time.Year && v.record_time.Month == this_time.Month && v.record_time.Day == this_time.Day).Sum(v=>v.stock)
}) ;
stock = stock_list.Where(v => v.warehouse_code == item.warehouse_code && v.record_time.Year == this_time.Year && v.record_time.Month == this_time.Month && v.record_time.Day == this_time.Day).Sum(v => v.stock)
});
}
this_time = this_time.AddDays(-1);
......@@ -3211,7 +3214,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
public static List<report_stock_week_view_dto> ReportStockWeekView(report_stock_week_view_search_dto search)
{
var btime = DateTime.Now.AddDays(-(7 * 4)).GetWeekFirstDayMon().ToDayHome();
var etime = btime.AddDays(7*24).GetWeekLastDaySun().ToDayEnd();
var etime = btime.AddDays(7 * 24).GetWeekLastDaySun().ToDayEnd();
if (search.btime != null)
{
btime = search.btime.Value;
......@@ -3226,7 +3229,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
var datas_web_site_group = datas.GroupBy(s => s.web_site).ToList();
foreach (var websiteGroupItem in datas_web_site_group.OrderByDescending(s=>s.Key))
foreach (var websiteGroupItem in datas_web_site_group.OrderByDescending(s => s.Key))
{
r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "出单sku数量占比", weeks = new List<report_stock_week_view_dto.week>() { } });
r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "不出单数量sku占比", weeks = new List<report_stock_week_view_dto.week>() { } });
......@@ -3274,56 +3277,56 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
var puhuo_sum_val = this_datas.Where(s => s.sku_tag == "普货-精准开发").Count();
var qinhuo_sum_val = this_datas.Where(s => s.sku_tag == "清货").Count();
var meirong_sum_val = this_datas.Where(s => s.sku_tag == "美容SKU").Count();
var sum_stock_val = this_datas.Sum(s=>s.stock);
var puhuo_sum_stock_val = this_datas.Where(s=> s.sku_tag == "普货-精准开发").Sum(s=>s.stock);
var qinhuo_sum_stock_val = this_datas.Where(s=> s.sku_tag == "清货").Sum(s=>s.stock);
var meirong_sum_stock_val = this_datas.Where(s=> s.sku_tag == "美容SKU").Sum(s=>s.stock);
var sum_stock_amount_val = this_datas.Sum(s=>s.stock_amount);
var puhuo_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "普货-精准开发").Sum(s=>s.stock_amount);
var qinhuo_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "清货").Sum(s=>s.stock_amount);
var meirong_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "美容SKU").Sum(s=>s.stock_amount);
var sum_sales_val = this_datas.Sum(s=>s.sales);
var sum_sales_amount_val = this_datas.Sum(s=>s.sales_amount);
var sum_cost_amount_amount_val = this_datas.Sum(s=>s.cost_amount);
var chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==1).Count();
var puhuo_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "普货-精准开发").Count();
var qinhuo_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "清货").Count();
var meirong_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "美容SKU").Count();
var bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==0).Count();
var puhuo_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "普货-精准开发").Count();
var qinhuo_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "清货").Count();
var meirong_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "美容SKU").Count();
var chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==1).Sum(s=>s.stock);
var puhuo_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "普货-精准开发").Sum(s=>s.stock);
var qinhuo_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "清货").Sum(s=>s.stock);
var meirong_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "美容SKU").Sum(s=>s.stock);
var bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==0).Sum(s => s.stock);
var puhuo_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "普货-精准开发").Sum(s => s.stock);
var qinhuo_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "清货").Sum(s => s.stock);
var meirong_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "美容SKU").Sum(s => s.stock);
var chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1).Sum(s=>s.stock_amount);
var puhuo_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "普货-精准开发").Sum(s=>s.stock_amount);
var qinhuo_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "清货").Sum(s=>s.stock_amount);
var meirong_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag == "美容SKU").Sum(s=>s.stock_amount);
var bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==0).Sum(s => s.stock_amount);
var puhuo_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "清货").Sum(s => s.stock_amount);
var meirong_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==0 && s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
var jinzhun_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "普货-精准开发").Count();
var jinzhun_sku_order_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag== "普货-精准开发").Count();
var jinzhun_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag== "普货-精准开发").Sum(s => s.stock_amount);
var jinzhun_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1 && s.sku_tag== "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "清货").Count();
var qinhuo_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag== "清货").Count();
var qinhuo_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag== "清货").Sum(s => s.stock_amount);
var qinhuo_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag== "清货").Sum(s => s.stock_amount);
var meirong_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "美容SKU").Count();
var meirong_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag== "美容SKU").Count();
var meirong_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag== "美容SKU").Sum(s => s.stock_amount);
var meirong_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag== "美容SKU").Sum(s => s.stock_amount);
var sum_stock_val = this_datas.Sum(s => s.stock);
var puhuo_sum_stock_val = this_datas.Where(s => s.sku_tag == "普货-精准开发").Sum(s => s.stock);
var qinhuo_sum_stock_val = this_datas.Where(s => s.sku_tag == "清货").Sum(s => s.stock);
var meirong_sum_stock_val = this_datas.Where(s => s.sku_tag == "美容SKU").Sum(s => s.stock);
var sum_stock_amount_val = this_datas.Sum(s => s.stock_amount);
var puhuo_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "清货").Sum(s => s.stock_amount);
var meirong_sum_stock_amount_val = this_datas.Where(s => s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
var sum_sales_val = this_datas.Sum(s => s.sales);
var sum_sales_amount_val = this_datas.Sum(s => s.sales_amount);
var sum_cost_amount_amount_val = this_datas.Sum(s => s.cost_amount);
var chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 1).Count();
var puhuo_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "普货-精准开发").Count();
var qinhuo_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "清货").Count();
var meirong_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "美容SKU").Count();
var bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 0).Count();
var puhuo_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "普货-精准开发").Count();
var qinhuo_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "清货").Count();
var meirong_bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "美容SKU").Count();
var chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 1).Sum(s => s.stock);
var puhuo_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "普货-精准开发").Sum(s => s.stock);
var qinhuo_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "清货").Sum(s => s.stock);
var meirong_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "美容SKU").Sum(s => s.stock);
var bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 0).Sum(s => s.stock);
var puhuo_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "普货-精准开发").Sum(s => s.stock);
var qinhuo_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "清货").Sum(s => s.stock);
var meirong_bu_chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "美容SKU").Sum(s => s.stock);
var chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1).Sum(s => s.stock_amount);
var puhuo_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "清货").Sum(s => s.stock_amount);
var meirong_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
var bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 0).Sum(s => s.stock_amount);
var puhuo_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "清货").Sum(s => s.stock_amount);
var meirong_bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 0 && s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
var jinzhun_sku_val = (decimal)this_datas.Where(s => s.sku_tag == "普货-精准开发").Count();
var jinzhun_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "普货-精准开发").Count();
var jinzhun_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var jinzhun_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "普货-精准开发").Sum(s => s.stock_amount);
var qinhuo_sku_val = (decimal)this_datas.Where(s => s.sku_tag == "清货").Count();
var qinhuo_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "清货").Count();
var qinhuo_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag == "清货").Sum(s => s.stock_amount);
var qinhuo_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "清货").Sum(s => s.stock_amount);
var meirong_sku_val = (decimal)this_datas.Where(s => s.sku_tag == "美容SKU").Count();
var meirong_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "美容SKU").Count();
var meirong_sku_stock_amount_val = (decimal)this_datas.Where(s => s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
var meirong_sku_order_stock_amount_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag == "美容SKU").Sum(s => s.stock_amount);
#region 普货,精准开发
......@@ -3416,7 +3419,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
});
#endregion
#region 清货
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "清货-出单sku数量占比").weeks.Add(new report_stock_week_view_dto.week
......@@ -3464,7 +3467,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
#endregion
r_datas.SingleOrDefault(s => s.web_site== websiteGroupItem.Key && s.tag == "出单sku数量占比").weeks.Add(new report_stock_week_view_dto.week
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "出单sku数量占比").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = chudan_sku_val,
......@@ -3477,7 +3480,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
val = bu_chudan_sku_val,
ratio = bu_chudan_sku_val.Division(sum_val)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "出单sku库存数量占比").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
......@@ -3490,8 +3493,8 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = bu_chudan_sku_stock_val,
ratio = bu_chudan_sku_stock_val.Division(sum_stock_val)
});
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "出单sku库存金额占比").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
......@@ -3506,7 +3509,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
ratio = bu_chudan_sku_stock_amount_val.Division(sum_stock_amount_val)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "总SKU数").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
......@@ -3546,7 +3549,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
public static List<report_stock_week_view_dto> ReportPurchaseWeekView(report_stock_week_view_search_dto search)
{
var btime = DateTime.Now.AddDays(-(7 * 4)).GetWeekFirstDayMon().ToDayHome();
var etime = btime.AddDays(7*24).GetWeekLastDaySun().ToDayEnd();
var etime = btime.AddDays(7 * 24).GetWeekLastDaySun().ToDayEnd();
if (search.btime != null)
{
btime = search.btime.Value;
......@@ -3583,41 +3586,41 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
var e_thie_date = b_thie_date.GetWeekLastDaySun().ToDayEnd();
var this_datas = websiteGroupItem.Where(s => s.first_day_date >= b_thie_date && s.first_day_date <= e_thie_date).ToList();
r_datas.SingleOrDefault(s => s.web_site== websiteGroupItem.Key && s.tag == "上周新品下单sku个数").weeks.Add(new report_stock_week_view_dto.week
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品下单sku个数").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s=>s.type==1 && s.is_new==1).Count()
val = this_datas.Where(s => s.type == 1 && s.is_new == 1).Count()
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品下单总数量").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s => s.type == 1 && s.is_new == 1).Sum(s=>s.quantity_purchase)
val = this_datas.Where(s => s.type == 1 && s.is_new == 1).Sum(s => s.quantity_purchase)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品下sku金额").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s => s.type == 1 && s.is_new == 1).Sum(s=>s.amount_paid)
});
val = this_datas.Where(s => s.type == 1 && s.is_new == 1).Sum(s => s.amount_paid)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品已调走sku个数").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s => s.type == 2 && s.is_new == 1).Count()
});
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品已调走总数量").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s => s.type == 2 && s.is_new == 1).Sum(s=>s.quantity_purchase)
});
val = this_datas.Where(s => s.type == 2 && s.is_new == 1).Sum(s => s.quantity_purchase)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周新品已调走sku金额").weeks.Add(new report_stock_week_view_dto.week
{
tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
val = this_datas.Where(s => s.type == 2 && s.is_new == 1).Sum(s=>s.amount_paid)
val = this_datas.Where(s => s.type == 2 && s.is_new == 1).Sum(s => s.amount_paid)
});
r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "上周补货下单sku个数").weeks.Add(new report_stock_week_view_dto.week
......@@ -3670,7 +3673,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
{
var weeks = new List<string>();
var btime = DateTime.Now.AddDays(-(7 * 4)).GetWeekFirstDayMon().ToDayHome();
var etime = btime.AddDays(7*4).GetWeekLastDaySun().ToDayEnd();
var etime = btime.AddDays(7 * 4).GetWeekLastDaySun().ToDayEnd();
if (search.btime != null)
{
btime = search.btime.Value;
......@@ -3691,7 +3694,7 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
return weeks;
}
/// <summary>
/// 库存-采购每周备份
......@@ -3707,7 +3710,7 @@ where `status`!=-1
GROUP BY t1.bailun_sku,t1.warehouse_into_code) as t2
set t1.first_purchase_date = t2.min_time
where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code=t2.warehouse_code;
",commandTimeout:0);
", commandTimeout: 0);
_connection.Execute(@"-- 刷新首次调拨时间
......@@ -3829,7 +3832,7 @@ select warehouse_code,sum(usable_stock) as 'stock', @record_time as 'record_tim
from dc_base_stock as t1
where t1.usable_stock>0
group by warehouse_code
)",new { record_time = DateTime.Now.AddDays(-1)});
)", new { record_time = DateTime.Now.AddDays(-1) });
}
/// <summary>
......@@ -3838,7 +3841,7 @@ group by warehouse_code
public static void CalculationSalesTrend()
{
var btime = DateTime.Now.AddYears(-1).ToString("yyyy-01-01 00:00:00");
var datas = _connection.Query<dc_report_sales_trend_year>(@"
var datas = _connection.Query<dc_report_sales_trend_year>(@"
select
sum(t1.bailun_sku_quantity_ordered) as 'sales',
t2.area_name as 'country_code',
......@@ -3857,11 +3860,11 @@ where t1.bailun_order_status != 'Canceled'
and t1.has_platsku_remark = 0
and t1.paid_time>=@btime -- and t1.paid_time<'2020-01-10'
GROUP BY t2.hq_type,t2.area_name,date_format(paid_time, '%Y-%m')
", new { btime },commandTimeout:0).ToList();
", new { btime }, commandTimeout: 0).ToList();
foreach (var item in datas)
{
if(item.warehouse_type!=null && item.country_code != null)
if (item.warehouse_type != null && item.country_code != null)
{
var oldData = _connection.QuerySingleOrDefault<dc_report_sales_trend_year>(" select * from dc_report_sales_trend_year where date_str=@date_str and warehouse_type=@warehouse_type and country_code=@country_code ", new
{
......@@ -3896,10 +3899,51 @@ where t1.bailun_order_status != 'Canceled'
_connection.Insert(item);
}
}
}
}
/// <summary>
/// 设置默认头程方式
/// </summary>
public static void ResetHeadType()
{
var btime = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd 00:00:00");
var stocks = _connection.Query<bailun_sku_dto>(" select t1.bailun_sku,t1.warehouse_code,t2.hq_type from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code =t2.warehouse_code where t1.gmt_create>=@btime ", new { btime = btime }).ToList();
foreach (var item in stocks)
{
if ("fba仓".Equals(item.hq_type, StringComparison.OrdinalIgnoreCase) || "第三方仓库".Equals(item.hq_type, StringComparison.OrdinalIgnoreCase))
{
// 查询是否存在
var count = _connection.QuerySingleOrDefault<int>(" select count(1) from dc_base_head_transport_config where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new
{
item.bailun_sku,
item.warehouse_code
});
if (count <= 0)
{
_connection.Insert(new dc_base_head_transport_config
{
bailun_sku = item.bailun_sku,
warehouse_code = item.warehouse_code,
create_date = DateTime.Now,
create_user = "system",
delete_user = "",
is_delete = 0,
logistics_code = "",
logistics_name = "",
head_transport = "fba仓".Equals(item.hq_type, StringComparison.OrdinalIgnoreCase) ? "海运" : "空运"
});
}
}
}
}
public class bailun_sku_dto
{
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public string hq_type { get; set; }
}
}
}
......
......@@ -64,6 +64,12 @@ namespace AutoTurnOver.Purchase.AverageTarget
try
{
var now = DateTime.Now;
if (now.Hour == 23 && now.Minute == 01)
{
Console.WriteLine($"开始 设置默认头程方式,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report.ResetHeadType();
Console.WriteLine($"结束 设置默认头程方式,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
// 判断是不是指定的时间
if (now.Hour == 23 && now.Minute == 58)
{
......
......@@ -23,7 +23,8 @@ namespace AutoTurnOver.Purchase.AverageTarget
Console.WriteLine("采购平均值计算任务启动...");
try
{
PurchaseAverageTargetServices.CalculationTransfer("942517901");
//PurchaseAverageTargetServices.CalculationTransfer("942517901");
}
catch (Exception ex)
{
......
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