Commit 3c1397d7 by 泽锋 李

fix

parent eacb729a
...@@ -623,8 +623,8 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code ...@@ -623,8 +623,8 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
datas[0].product_count_1 = transDatas.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count); datas[0].product_count_1 = transDatas.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count);
datas[0].order_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count(); datas[0].order_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count();
datas[0].product_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Sum(s => s.count); datas[0].product_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Sum(s => s.count);
datas[0].order_count_2 = transDatas.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count(); datas[0].order_count_3 = transDatas.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count();
datas[0].product_count_2 = transDatas.Where(s => s.transport_type_str == "空运").Sum(s => s.count); datas[0].product_count_3 = transDatas.Where(s => s.transport_type_str == "空运").Sum(s => s.count);
// 在库库存分析 // 在库库存分析
var stock = _connection.QueryFirstOrDefault<int?>(" select usable_stock from dc_base_stock as t1 where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code ", parameters)??0; var stock = _connection.QueryFirstOrDefault<int?>(" select usable_stock from dc_base_stock as t1 where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code ", parameters)??0;
...@@ -649,7 +649,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code ...@@ -649,7 +649,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
(case when t9.transport_type=1 then '铁路运输' when t9.transport_type=2 then '海运' when t9.transport_type=3 then '空运' else '未知' end ) as 'transport_type_str' (case when t9.transport_type=1 then '铁路运输' when t9.transport_type=2 then '海运' when t9.transport_type=3 then '空运' else '未知' end ) as 'transport_type_str'
from dc_base_transfer_info as t1 from dc_base_transfer_info as t1
left join dc_base_lms_channel as t9 on t1.channelname = t9.`name` left join dc_base_lms_channel as t9 on t1.channelname = t9.`name`
where `code`=@code limit 1 where t1.`code`=@code limit 1
",new { code = item.system_order_no}); ",new { code = item.system_order_no});
stock_orders.Add(new dc_base_trans_expectarrivaltime_temp { count = use_stock , main_code = item.system_order_no,transport_type_str = transport_type_str }); stock_orders.Add(new dc_base_trans_expectarrivaltime_temp { count = use_stock , main_code = item.system_order_no,transport_type_str = transport_type_str });
} }
...@@ -664,8 +664,8 @@ where `code`=@code limit 1 ...@@ -664,8 +664,8 @@ where `code`=@code limit 1
datas[0].product_count_1 += stock_orders.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count); datas[0].product_count_1 += stock_orders.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count);
datas[0].order_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count(); datas[0].order_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count();
datas[0].product_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Sum(s => s.count); datas[0].product_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Sum(s => s.count);
datas[0].order_count_2 += stock_orders.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count(); datas[0].order_count_3 += stock_orders.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count();
datas[0].product_count_2 += stock_orders.Where(s => s.transport_type_str == "空运").Sum(s => s.count); datas[0].product_count_3 += stock_orders.Where(s => s.transport_type_str == "空运").Sum(s => s.count);
} }
} }
......
...@@ -24,8 +24,11 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -24,8 +24,11 @@ namespace AutoTurnOver.Purchase.AverageTarget
try try
{ {
//report.ResetTransExpectArrivaltime(); //report.ResetTransExpectArrivaltime();
//PurchaseAverageTargetServices.CalculationTransfer("942517901", days: (360 * 3)); //PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", days: (360 * 3));
//PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3)); //PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3));
//ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "LM-EO-007",targetwareno= "MMDUSFBA" });
PurchaseAverageTargetServices.SynchroTransferTransportType();
} }
catch (Exception ex) catch (Exception ex)
{ {
......
...@@ -7,6 +7,7 @@ using MySql.Data.MySqlClient; ...@@ -7,6 +7,7 @@ using MySql.Data.MySqlClient;
using AutoTurnOver.Models; using AutoTurnOver.Models;
using Dapper; using Dapper;
using AutoTurnOver.Utility; using AutoTurnOver.Utility;
using AutoTurnOver.Models.Report;
namespace AutoTurnOver.Services namespace AutoTurnOver.Services
{ {
...@@ -723,6 +724,67 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp ...@@ -723,6 +724,67 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
return AveragePurchase.GetWarehouse(sku, warehouse_code); return AveragePurchase.GetWarehouse(sku, warehouse_code);
} }
/// <summary>
/// 刷新调拨运输方式比例
/// </summary>
public static void SynchroTransferTransportType()
{
var task_name = $"SynchroTransferTransportType_v1";
var conn = MyMySqlConnection._connection; ;
// 查询最后一次成功抓取的记录
var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });
var new_task_synchro_log = new task_synchro_log
{
create_date = DateTime.Now,
end_time = DateTime.Now,
status = 0,
task_name = task_name
};
if (last_task_synchro_log != null)
{
new_task_synchro_log.start_time = last_task_synchro_log.end_time.AddMinutes(-1);
}
else
{
new_task_synchro_log.start_time = DateTime.Now.AddYears(-1);
}
new_task_synchro_log.id = conn.Insert(new_task_synchro_log) ?? 0;
int count = 0;
int page = 1;
int rows = 1000;
while (true)
{
var datas = conn.Query<sku_warehouse_code_dto>($@" select t1.bailun_sku,t1.warehouse_code from dc_base_stock as t1 left join dc_base_warehouse as t2 on t1.warehouse_code =t2.warehouse_code
where t2.hq_type not in ('国内仓') and t1.gmt_modified>=@btime and t1.gmt_modified <=@etime
order by t1.gmt_modified asc
limit {(page-1)*rows},{rows} ",new { btime = new_task_synchro_log.start_time,etime = new_task_synchro_log.end_time }).ToList();
if (datas.Count <= 0) { break; }
foreach (var orderItem in datas)
{
try
{
ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku = orderItem.bailun_sku, targetwareno = orderItem .warehouse_code});
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
Console.WriteLine(ex.StackTrace);
}
}
}
new_task_synchro_log.count = count;
new_task_synchro_log.status = 1;
conn.Update(new_task_synchro_log);
}
} }
......
namespace AutoTurnOver.Services
{
public class sku_warehouse_code_dto
{
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
}
}
\ No newline at end of file
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