Skip to content

D
data-center-auto
Commit 98b9dadb by 泽锋 李
Options

fix

parent 6fa7d598
Showing with 119 additions and 49 deletions
AutoTurnOver.DB/dc_auto_turnover.cs
...@@ -1022,6 +1022,38 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime ...@@ -1022,6 +1022,38 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime
) )
", new { btime = DateTime.Now.ToDayHome(), etime = DateTime.Now.ToDayEnd() }); ", new { btime = DateTime.Now.ToDayHome(), etime = DateTime.Now.ToDayEnd() });
} }
/// <summary>
/// 获取数据来源
/// </summary>
/// <returns></returns>
public static List<dc_base_order_data_source> GetOrderDataSource(dc_base_order_data_source_search_dto searchData, int offset, int limit, ref int total)
{
var sql = " select * from dc_base_order_data_source as t1 where 1=1 ";
var countSql = " select count(1) from dc_base_order_data_source as t1 where 1=1 ";
DynamicParameters parameters = new DynamicParameters();
if(!string.IsNullOrWhiteSpace(searchData.bailun_sku))
{
sql += " and t1.bailun_sku=@bailun_sku ";
countSql += " and t1.bailun_sku=@bailun_sku ";
parameters.Add("bailun_sku",searchData.bailun_sku);
}
if (!string.IsNullOrWhiteSpace(searchData.warehouse_code))
{
sql += " and t1.warehouse_code=@warehouse_code ";
countSql += " and t1.warehouse_code=@warehouse_code ";
parameters.Add("warehouse_code", searchData.warehouse_code);
}
if (!string.IsNullOrWhiteSpace(searchData.order_type_str))
{
sql += " and t1.order_type=@order_type ";
countSql += " and t1.order_type=@order_type ";
parameters.Add("order_type", searchData.order_type_str);
}
sql += " limit " + offset + "," + limit;
total = _connection.QueryFirstOrDefault<int>(countSql, parameters);
return _connection.Query<dc_base_order_data_source>(sql, parameters).AsList();
}
} }
......
AutoTurnOver.Models/dc_base_order_data_source.cs
...@@ -20,4 +20,29 @@ namespace AutoTurnOver.Models ...@@ -20,4 +20,29 @@ namespace AutoTurnOver.Models
public string logistics_name { get; set; } public string logistics_name { get; set; }
public string transport_type { get; set; } public string transport_type { get; set; }
} }
public class dc_base_order_data_source_search_dto
{
public int order_type { get; set; }
public string order_type_str { get {
if (order_type == 11)
{
return "采购单-签收天数计算";
}
else if (order_type == 12)
{
return "采购单-质检入库天数计算";
}
else if (order_type == 2)
{
return "调拨单-平均天数计算";
}
else
{
return "";
}
} }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
}
} }
AutoTurnOver.Purchase.AverageTarget/Program.cs
...@@ -31,7 +31,7 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -31,7 +31,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
//PurchaseAverageTargetServices.CalculationTransfer(); //PurchaseAverageTargetServices.CalculationTransfer();
//report.ResetTransExpectArrivaltime(); //report.ResetTransExpectArrivaltime();
//dc_auto_return_goods_config_dao.NewCalculation(); //dc_auto_return_goods_config_dao.NewCalculation();
//PurchaseAverageTargetServices.CalculationTransfer(days: 180); //PurchaseAverageTargetServices.CalculationTransfer("948890401", days: 360);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
AutoTurnOver.Services/PurchaseAverageTargetServices.cs
...@@ -142,7 +142,7 @@ namespace AutoTurnOver.Services ...@@ -142,7 +142,7 @@ namespace AutoTurnOver.Services
conn.Update(task_log); conn.Update(task_log);
} }
public static void CalculationTransfer(string bailun_sku = "",int days = 30) public static void CalculationTransfer(string bailun_sku = "", int days = 30)
{ {
MyMySqlConnection conn = connectionHelper._connection; MyMySqlConnection conn = connectionHelper._connection;
...@@ -164,7 +164,9 @@ namespace AutoTurnOver.Services ...@@ -164,7 +164,9 @@ namespace AutoTurnOver.Services
var chageSkuList = AveragePurchase.GetTransferChangeSku(days, bailun_sku); var chageSkuList = AveragePurchase.GetTransferChangeSku(days, bailun_sku);
foreach (var skuItem in chageSkuList) foreach (var skuItem in chageSkuList)
{ {
if (skuItem.warehouse_code == "MDBLWYT") try
{
if (skuItem.warehouse_code == "QMSUSFBA")
{ {
} }
...@@ -222,39 +224,6 @@ namespace AutoTurnOver.Services ...@@ -222,39 +224,6 @@ namespace AutoTurnOver.Services
} }
} }
// 计算平均海运调拨天数
// 查询最近5次海运（已完成）记录
//var transport1List = AveragePurchase.GetTransportList(skuItem.bailun_sku, skuItem.warehouse_code, "海运", "", _seed_count);
//var transport1List = ApiUtility.GetLmsOrderTransfer(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
//{
// bailun_sku = skuItem.bailun_sku,
// warehouse_code = skuItem.warehouse_code,
// orders = 10,
// transfer_type = 2
//});
//if (transport1List != null && transport1List.Count() >= 1)
//{
// dataWarehouse.transfer_type_1_days = (decimal)transport1List.Sum(s => (s.sign_time - s.shipping_time).TotalDays) / transport1List.Count();
// dataWarehouse.transfer_type_1_days = (decimal)transport1List.Sum(s => (s.put_time - s.sign_time).TotalDays) / transport1List.Count();
//}
// 计算平均空运调拨天数
// 查询最近5次空运（已完成）记录
//var transport2List = AveragePurchase.GetTransportList(skuItem.bailun_sku, skuItem.warehouse_code, "空运", "", _seed_count);
//var transport2List = ApiUtility.GetLmsOrderTransfer(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
//{
// bailun_sku = skuItem.bailun_sku,
// warehouse_code = skuItem.warehouse_code,
// orders = _seed_count,
// transfer_type = 3
//});
//if (transport2List != null && transport2List.Count() >= 1)
//{
// dataWarehouse.transfer_type_2_days = (decimal)transport2List.Sum(s => (s.put_time - s.shipping_time).TotalDays) / transport2List.Count();
//}
//头程天数 //头程天数
// 查询是否有默认渠道 // 查询是否有默认渠道
var dc_base_head_transport_config_data = conn.QuerySingleOrDefault<dc_base_head_transport_config>(" select * from dc_base_head_transport_config where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and is_delete=0 ", new var dc_base_head_transport_config_data = conn.QuerySingleOrDefault<dc_base_head_transport_config>(" select * from dc_base_head_transport_config where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and is_delete=0 ", new
...@@ -276,14 +245,6 @@ namespace AutoTurnOver.Services ...@@ -276,14 +245,6 @@ namespace AutoTurnOver.Services
{ {
transfer_type = 3; transfer_type = 3;
} }
//var transport3List = ApiUtility.GetLmsOrderTransfer(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
//{
// bailun_sku = skuItem.bailun_sku,
// warehouse_code = skuItem.warehouse_code,
// orders = 10,
// logistics_code = dc_base_head_transport_config_data.logistics_code,
// transfer_type = transfer_type
//});
//如果没有配置渠道，则去lms查哪些渠道可发 //如果没有配置渠道，则去lms查哪些渠道可发
if (string.IsNullOrWhiteSpace(dc_base_head_transport_config_data.logistics_code)) if (string.IsNullOrWhiteSpace(dc_base_head_transport_config_data.logistics_code))
...@@ -295,9 +256,9 @@ namespace AutoTurnOver.Services ...@@ -295,9 +256,9 @@ namespace AutoTurnOver.Services
character_skus = skuItem.bailun_sku, character_skus = skuItem.bailun_sku,
startPoint = "3" startPoint = "3"
}); });
if(logisticsDatas!=null && logisticsDatas.Count >= 1) if (logisticsDatas != null && logisticsDatas.Count >= 1)
{ {
dc_base_head_transport_config_data.logistics_code = string.Join(",", logisticsDatas.Select(s=>s.Line_Code)); dc_base_head_transport_config_data.logistics_code = string.Join(",", logisticsDatas.Select(s => s.Line_Code));
} }
else else
{ {
...@@ -327,7 +288,7 @@ namespace AutoTurnOver.Services ...@@ -327,7 +288,7 @@ namespace AutoTurnOver.Services
if (lmsAvg.Count() >= 3) if (lmsAvg.Count() >= 3)
{ {
dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.put_days!=null).Sum(s => s.put_days) - lmsAvg.Max(s => s.put_days) - lmsAvg.Min(s => s.put_days)) / (lmsAvg.Count - 2)); dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.put_days != null).Sum(s => s.put_days) - lmsAvg.Max(s => s.put_days) - lmsAvg.Min(s => s.put_days)) / (lmsAvg.Count - 2));
} }
else if (lmsAvg.Where(s => s.put_days != null).Count() >= 1) else if (lmsAvg.Where(s => s.put_days != null).Count() >= 1)
{ {
...@@ -340,11 +301,12 @@ namespace AutoTurnOver.Services ...@@ -340,11 +301,12 @@ namespace AutoTurnOver.Services
} }
// 清空记录，重新记录数据源 // 清空记录，重新记录数据源
conn.Execute(" delete from dc_base_order_data_source where bailun_sku_warehouse_code=@bailun_sku_warehouse_code and order_type=@order_type ",new { conn.Execute(" delete from dc_base_order_data_source where bailun_sku_warehouse_code=@bailun_sku_warehouse_code and order_type=@order_type ", new
{
bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}", bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
order_type = "调拨单-平均天数计算" order_type = "调拨单-平均天数计算"
}); });
if(lmsAvg!=null && lmsAvg.Count >= 1) if (lmsAvg != null && lmsAvg.Count >= 1)
{ {
foreach (var itemLms in lmsAvg) foreach (var itemLms in lmsAvg)
{ {
...@@ -369,6 +331,18 @@ namespace AutoTurnOver.Services ...@@ -369,6 +331,18 @@ namespace AutoTurnOver.Services
AveragePurchase.Save(dataWarehouse, conn); AveragePurchase.Save(dataWarehouse, conn);
}
catch (Exception ex)
{
conn.Insert(new dc_task_error_log
{
date = DateTime.Now,
task_name = "CalculationTransfer",
message = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
stack_trace = ex.Message + ": "+ ex.StackTrace
});
}
} }
......
AutoTurnOver.Services/SkuAutoTurnServices.cs
...@@ -33,6 +33,11 @@ namespace AutoTurnOver.Services ...@@ -33,6 +33,11 @@ namespace AutoTurnOver.Services
return DB.dc_auto_turnover.List(m,offset, limit, ref total,order,sort, isSum); return DB.dc_auto_turnover.List(m,offset, limit, ref total,order,sort, isSum);
} }
public List<dc_base_order_data_source> GetOrderDataSource(dc_base_order_data_source_search_dto m,int offset, int limit, ref int total)
{
return DB.dc_auto_turnover.GetOrderDataSource(m,offset, limit, ref total);
}
public IEnumerable<string> GetLabelList() { public IEnumerable<string> GetLabelList() {
return DB.dc_auto_turnover.GetLabelList(); return DB.dc_auto_turnover.GetLabelList();
} }
......
AutoTurnOver/Controllers/SkuAutoTurnController.cs
...@@ -57,6 +57,40 @@ namespace AutoTurnOver.Controllers ...@@ -57,6 +57,40 @@ namespace AutoTurnOver.Controllers
} }
/// <summary>
/// 查看平均数的数据来源
/// </summary>
/// <param name="m"></param>
/// <param name="offset"></param>
/// <param name="limit"></param>
/// <returns></returns>
public JsonResult GetOrderDataSource([FromQuery] dc_base_order_data_source_search_dto m, [FromQuery] int offset, [FromQuery] int limit)
{
try
{
var total = 0;
var service = new Services.SkuAutoTurnServices();
var list = service.GetOrderDataSource(m, offset, limit, ref total);
return new JsonResult(new
{
rows = list,
total = total,
pagecount = (total / limit + (total % limit > 0 ? 1 : 0))
});
}
catch (Exception ex)
{
return new JsonResult(new
{
message = ex.Message,
stack_trace = ex.StackTrace
});
}
}
public JsonResult GetLabelList() public JsonResult GetLabelList()
{ {
return new JsonResult(new Services.SkuAutoTurnServices().GetLabelList()); return new JsonResult(new Services.SkuAutoTurnServices().GetLabelList());
......
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