Commit ce88818e by zhoujinhui

修正缺货查询

parent 2a433df9
......@@ -80,16 +80,16 @@ namespace AutoTurnOver.DB
LEFT JOIN (
SELECT bailun_sku,SUM(bailun_sku_quantity_refund)AS weekly_refunds_num,
SUM(bailun_sku_quantity_refund*bailun_sku_unit_price)AS weekly_refund_amount
FROM dc_base_crm_refund WHERE refund_time>='{startTime}' AND refund_time<'{endtime}' GROUP BY bailun_sku
FROM dc_base_crm_refund WHERE refund_time>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND refund_time<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' GROUP BY bailun_sku
)AS t2 ON t2.bailun_sku = t1.bailun_sku
INNER JOIN dc_base_sku AS t3 ON t3.bailun_sku = t1.bailun_sku
LEFT JOIN(SELECT bailun_sku,
SUM(profit_total)profit_total,SUM(amount_shipping)amount_shipping,SUM(profit_rate)AS profit_rate FROM dc_base_oms_sku_30
WHERE gmt_create>= '{startTime}' AND gmt_create< '{endtime}'
WHERE gmt_create>= '{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND gmt_create< '{endtime.ToString("yyyy-MM-dd HH:mm:ss")}'
and has_fba_s = 0 and has_delete = 0 and has_scalp = 0
and has_buyer_remark = 0 and has_platsku_remark = 0 and has_innersale = 0 and bailun_order_status !='Canceled'
and platform_order_type != '手工单' GROUP BY bailun_sku)AS t4 ON t4.bailun_sku = t1.bailun_sku
WHERE t1.sales_reset_date>='{startTime}' AND t1.sales_reset_date<'{endtime}' AND t1.bailun_sku_quantity_ordered_7>0
WHERE t1.sales_reset_date>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.sales_reset_date<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.bailun_sku_quantity_ordered_7>0
GROUP BY t1.bailun_sku ORDER BY t1.bailun_sku ASC
");
try
......
......@@ -120,7 +120,7 @@ namespace AutoTurnOver.DB
FROM dc_base_stock AS t1
LEFT JOIN dc_base_warehouse AS t2 ON t2.warehouse_code = t1.warehouse_code
LEFT JOIN dc_base_sku AS t3 ON t3.bailun_sku = t1.bailun_sku
WHERE 1=1 AND t1.gmt_create>='{startTime}' AND t1.gmt_create<'{endtime}' ORDER BY t1.Id DESC
WHERE 1=1 AND t1.gmt_create>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.gmt_create<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' ORDER BY t1.Id DESC
");
try
{
......
......@@ -112,12 +112,12 @@ namespace AutoTurnOver.DB
(( case when t5.average_overdue> 0 then t5.average_overdue else 1 end ) * t5.quantity_safe_inventory ) as 'quantity_safe'
FROM(
SELECT bailun_sku,warehouse_code,MAX(gmt_out_stock_modified) AS gmt_out_stock_modified FROM dc_mid_transit
WHERE gmt_out_stock_modified>= '{startTime}' AND gmt_out_stock_modified< '{endtime}' GROUP BY bailun_sku,warehouse_code
WHERE gmt_out_stock_modified>= '{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND gmt_out_stock_modified< '{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' GROUP BY bailun_sku,warehouse_code
) AS t1
LEFT JOIN dc_base_stock AS t3 ON t3.bailun_sku = t1.bailun_sku AND t3.warehouse_code = t1.warehouse_code
LEFT JOIN(
SELECT bailun_sku,warehouse_code,SUM(bailun_sku_quantity_ordered)bailun_sku_quantity_ordered FROM
dc_base_oms_sku_30 WHERE gmt_create>= '{startTime}' AND gmt_create< '{endtime}'
dc_base_oms_sku_30 WHERE gmt_create>= '{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND gmt_create< '{endtime.ToString("yyyy-MM-dd HH:mm:ss")}'
and has_fba_s = 0 and has_delete = 0 and has_scalp = 0
and has_buyer_remark = 0 and has_platsku_remark = 0 and has_innersale = 0 and bailun_order_status !='Canceled'
and platform_order_type != '手工单' GROUP BY bailun_sku,warehouse_code
......@@ -126,9 +126,7 @@ namespace AutoTurnOver.DB
LEFT JOIN dc_base_sku AS t6 ON t6.bailun_sku = t1.bailun_sku ");
try
{
Console.WriteLine($"GetGmtOutStockPageList:{connStr}");
var obj = _connection.Page<gmt_out_stock_page_output_dto>(offset, limit, sql.ToString(), ref total);
Console.WriteLine($"GetGmtOutStockPageList数据返回:{startTime}---{endtime}" );
return obj.AsList();
}
catch (Exception ex)
......
......@@ -132,8 +132,8 @@ namespace AutoTurnOver.Services
for (int i = 1; i < 30000; i++)
{
int offset = (i - 1) * limit;
DateTime startTime = DateTime.Now.AddDays(-1).Date;
DateTime endtime = DateTime.Now.Date.AddMilliseconds(-1);
DateTime startTime = DateTime.Now.AddDays(-1);
DateTime endtime = DateTime.Now;
var dataList = dc_auto_week_shortage_dao.GetGmtOutStockPageList(startTime, endtime, offset, limit, ref total);
if (dataList.Count <= 0) break;
var skus = dataList.Select(x => x.bailun_sku).ToList();
......@@ -163,7 +163,7 @@ namespace AutoTurnOver.Services
start_date = DateHelper.GetWeekFirstDayMon(DateTime.Now.AddDays(-1)),
end_date = DateHelper.GetWeekLastDaySun(DateTime.Now.AddDays(-1))
};
//dc_auto_week_shortage_dao.Insert(model);
dc_auto_week_shortage_dao.Insert(model);
Console.WriteLine($"写入缺货数据:{i}---{item.bailun_sku}");
}
}
......
......@@ -21,7 +21,6 @@ namespace AutoTurnOver.WeeklyStatistics
var now = DateTime.Now;
var dayOfWeek = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(now.DayOfWeek);
if (now.Hour == 0 && now.Minute == 1 && dayOfWeek.Equals("星期一"))
//if (now.Hour == 14 && now.Minute == 40)
{
try
{
......
......@@ -14,20 +14,19 @@ namespace AutoTurnOver.WeeklyStatistics
{
_timer = new Timer(DoWork, null, TimeSpan.Zero, TimeSpan.FromSeconds(60));
Console.WriteLine("执行缺货数据同步!");
new WeeklyStatisticsServices().TimingWeekShortageTask();
return Task.CompletedTask;
}
private void DoWork(object state)
{
var now = DateTime.Now;
if (now.Hour == 1 && now.Minute == 1)
if (now.Hour == 9 && now.Minute == 1)
{
try
{
Console.WriteLine($"开始 执行汇总统计,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Console.WriteLine($"开始 执行缺货数据同步,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new WeeklyStatisticsServices().TimingWeekShortageTask();
Console.WriteLine($"结束 执行汇总统计,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Console.WriteLine($"结束 执行缺货数据同步,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
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