Skip to content

D
data-center-auto
Commit 7a292a7c by 泽锋 李
Options

fix

parent 13772228
Showing with 77 additions and 49 deletions
AutoTurnOver.DB/report_cash_flow_dao.cs
......@@ -562,7 +562,7 @@ namespace AutoTurnOver.DB
/// </summary>
/// <param name="btime"></param>
/// <param name="etime"></param>
public static void CalculationPurchaseOrder(DateTime btime, DateTime etime)
public static void CalculationPurchaseOrder(DateTime btime, DateTime etime, string purchase_id = null, string bailun_sku = null)
{
try
{
......@@ -578,6 +578,15 @@ namespace AutoTurnOver.DB
DynamicParameters parameters = new DynamicParameters();
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59"));
if (!string.IsNullOrWhiteSpace(purchase_id))
{
sql += " and t1.purchase_id=@purchase_id ";
parameters.Add("purchase_id", purchase_id);
}if (!string.IsNullOrWhiteSpace(bailun_sku))
{
sql += " and t1.bailun_sku=@bailun_sku ";
parameters.Add("bailun_sku", bailun_sku);
}
sql += $" limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_purchase_details_dto>(sql, parameters).AsList();
if (order_list == null || order_list.Count <= 0)
......@@ -702,7 +711,7 @@ namespace AutoTurnOver.DB
}
catch (Exception ex)
{
Console.WriteLine($"现金流-采购单-{order_item.purchase_id}-异常" + ex.Message);
Console.WriteLine($"现金流-采购单-{order_item.purchase_id}-{order_item.bailun_sku}-异常" + ex.Message);
Console.WriteLine("现金流-采购单-异常" + ex.StackTrace);
}
......@@ -822,6 +831,7 @@ where t1.gmt_create>=@btime and t1.gmt_create<=@etime ";
var logisticsList = ApiUtility.RealTimeShipLogisticsList();
List<dc_report_logistics_company_config_dto> logistics_company_list = conn.Query<dc_report_logistics_company_config_dto>(" select * from dc_report_logistics_company_config ").AsList();
List<dc_report_cash_flow_config> configs = conn.Query<dc_report_cash_flow_config>(" select * from dc_report_cash_flow_config ").AsList();
List<dc_auto_config_safe_inventory> inventoryConfigs = conn.Query<dc_auto_config_safe_inventory>(" select * from dc_auto_config_safe_inventory ").AsList();
while (true)
{
var now = DateTime.Now;
......@@ -846,7 +856,6 @@ 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(occur_time, conn, inventoryConfigs, order_item.warehouse_code, order_item.bailun_sku);
if(platforms!=null && platforms.Count >= 1)
{
......@@ -1111,7 +1120,7 @@ GROUP BY platform_type,website";
btime7 = now.AddDays(-7).ToDayHome(),
btime14 = now.AddDays(-14).ToDayHome(),
btime30 = now.AddDays(-30).ToDayHome(),
ctime = occurDate.ToDayEnd(),
ctime = now.ToDayEnd(),
bailun_sku = bailun_sku,
warehouse_code = warehouse_code
}).ToList();
......@@ -1171,6 +1180,20 @@ GROUP BY platform_type,website";
parameters.Add("btime", btime);
parameters.Add("etime", etime);
if(!string.IsNullOrWhiteSpace(search.platform_type))
{
occur_sql += " and platform_type=@platform_type ";
pay_sql += " and platform_type=@platform_type ";
parameters.Add("platform_type", search.platform_type);
}
if(!string.IsNullOrWhiteSpace(search.web_site))
{
occur_sql += " and web_site=@web_site ";
pay_sql += " and web_site=@web_site ";
parameters.Add("web_site", search.web_site);
}
var occur_datas = conn.Query<dc_report_cash_flow_group_day>(occur_sql, parameters, commandTimeout: 0).ToList();
var pay_datas = conn.Query<dc_report_cash_flow_group_day>(pay_sql, parameters, commandTimeout: 0).ToList();
......
AutoTurnOver.Models/Report/dc_report_cash_flow_group_day.cs
......@@ -14,5 +14,7 @@ namespace AutoTurnOver.Models.Report
public int data_type { get; set; }
public int type { get; set; }
public DateTime date { get; set; }
public string platform_type { get; set; }
public string web_site { get; set; }
}
}
AutoTurnOver.Models/dc_report_cash_flow_log.cs
......@@ -186,6 +186,8 @@ namespace AutoTurnOver.Models
{
public DateTime? btime { get; set; }
public DateTime? etime { get; set; }
public string platform_type { get; set; }
public string web_site { get; set; }
}
public class dc_report_cash_flow_log_export_search_dto
......
AutoTurnOver/Controllers/CashFlowController.cs
......@@ -18,12 +18,14 @@ namespace AutoTurnOver.Controllers
[ApiController]
public class CashFlowController : ControllerBase
{
public JsonResult GetView(DateTime? btime, DateTime? etime)
public JsonResult GetView(DateTime? btime, DateTime? etime,string platform_type,string web_site)
{
report_cash_flow_view_search_dto search_data = new report_cash_flow_view_search_dto
{
etime = etime,
btime = btime,
web_site = web_site,
platform_type = platform_type
};
var list = new CashFlowServices().GetView(search_data);
......
ResetOutofstock/Program.cs
......@@ -13,11 +13,10 @@ namespace ResetOutofstock
static async Task Main(string[] args)
{
Console.WriteLine("刷新缺货数据任务启动...");
//report_cash_flow_dao.CalculationOrderCostLogistics(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
//try
//{
// var now = DateTime.Now;
// report_cash_flow_dao.CalculationOrder(now.AddMonths(-3), DateTime.Parse(now.ToString("yyyy-MM-dd 23:59:59")));
// report_cash_flow_dao.CalculationPurchaseOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")), "P2005250048", "LM-EO-007");
//}
//catch (Exception ex)
//{
......
ResetOutofstock/ResetOutofstockBackgrounService.cs
......@@ -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