Commit 9a8ba8d6 by 泽锋 李

fix

parent 774bed6a
......@@ -589,8 +589,9 @@ namespace AutoTurnOver.DB
{
try
{
var occur_time = order_item.create_time ?? new DateTime(1991, 1, 1);
var warehouse_code = order_item.isallot == 1 ? order_item.warehouse_into_code : order_item.warehouse_from_code;
var platforms = GetPlatformShare(now,conn, inventoryConfigs, warehouse_code,order_item.bailun_sku);
var platforms = GetPlatformShare(occur_time, conn, inventoryConfigs, warehouse_code,order_item.bailun_sku);
if(platforms!=null && platforms.Count >= 1)
{
// 把原本未挂载平台的数据删除
......@@ -616,7 +617,7 @@ namespace AutoTurnOver.DB
web_site = platformItem.web_stie,
remarks = $" 原采购费用 {order_item.amount_paid} , 该平台-站点 日均加权值 {platformItem.sales_weight} 占比 {platformItem.ratio} ",
val = 0 - (Math.Abs(order_item.amount_paid) * platformItem.ratio),
occur_time = order_item.create_time ?? new DateTime(1991, 1, 1),
occur_time = occur_time,
warehouse_code = warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = $"{order_item.purchase_id}-{platformItem.platform_type}-{platformItem.web_stie}"
......@@ -844,8 +845,9 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
{
try
{
var occur_time = order_item.create_time;
List<dc_auto_config_safe_inventory> inventoryConfigs = conn.Query<dc_auto_config_safe_inventory>(" select * from dc_auto_config_safe_inventory ").AsList();
var platforms = GetPlatformShare(now, conn, inventoryConfigs, order_item.warehouse_code, order_item.bailun_sku);
var platforms = GetPlatformShare(occur_time, conn, inventoryConfigs, order_item.warehouse_code, order_item.bailun_sku);
if(platforms!=null && platforms.Count >= 1)
{
// 把原本未挂载平台的数据删除
......@@ -872,7 +874,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
web_site = platformItem.web_stie,
remarks = $" 原本调拨费用 {order_item.cost_first} 该平台站点 日均加权销量 {platformItem.sales_weight} 占比 {platformItem.ratio} ",
val = 0 - (Math.Abs(order_item.cost_first) * platformItem.ratio),
occur_time = order_item.create_time,
occur_time = occur_time,
warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = $"{order_item.transfer_order_id}-{platformItem.platform_type}-{platformItem.web_stie}"
......
......@@ -25,8 +25,7 @@ namespace ResetOutofstock
// throw;
//}
var now = DateTime.Now;
report_cash_flow_dao.CalculationPurchaseOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
......
......@@ -16,48 +16,48 @@ namespace ResetOutofstock
{
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
Console.WriteLine($"开始 刷新现金流 采购数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
var now = DateTime.Now;
report_cash_flow_dao.CalculationPurchaseOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
Console.WriteLine($"结束刷新现金流 采购数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
Thread.Sleep(240 * 60 * 60 * 1000);
}
});
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
var now = DateTime.Now;
Console.WriteLine($"开始 刷新订单 调拨 退款数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
Console.WriteLine($"结束 刷新订单 调拨 退款数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
Thread.Sleep(240 * 60 * 60 * 1000);
}
});
//Task.Factory.StartNew(() =>
//{
// while (true)
// {
// try
// {
// Console.WriteLine($"开始 刷新现金流 采购数据,线程Id:{Thread.CurrentThread.ManagedThreadId},{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
// var now = DateTime.Now;
// report_cash_flow_dao.CalculationPurchaseOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
// Console.WriteLine($"结束刷新现金流 采购数据,线程Id:{Thread.CurrentThread.ManagedThreadId},{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
// }
// catch (Exception ex)
// {
// Console.WriteLine(ex.Message);
// }
// Thread.Sleep(240 * 60 * 60 * 1000);
// }
//});
//Task.Factory.StartNew(() =>
//{
// while (true)
// {
// try
// {
// var now = DateTime.Now;
// Console.WriteLine($"开始 刷新订单 调拨 退款数据,线程Id:{Thread.CurrentThread.ManagedThreadId},{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
// report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
// Console.WriteLine($"结束 刷新订单 调拨 退款数据,线程Id:{Thread.CurrentThread.ManagedThreadId},{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
// }
// catch (Exception ex)
// {
// Console.WriteLine(ex.Message);
// }
// Thread.Sleep(240 * 60 * 60 * 1000);
// }
//});
Task.Factory.StartNew(() =>
......
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