Commit c3f29c39 by 泽锋 李

fix

parent 2a42bc8e
...@@ -68,6 +68,12 @@ namespace AutoTurnOver.Models ...@@ -68,6 +68,12 @@ namespace AutoTurnOver.Models
/// 订单数量 ( 空运 ) /// 订单数量 ( 空运 )
/// </summary> /// </summary>
public int order_count_3 { get; set; } public int order_count_3 { get; set; }
public decimal transfer_bale_delivery_ocean { get; set; }
public decimal abroad_inbound_delivery_ocean { get; set; }
public decimal transfer_delivery_ocean { get; set; }
public decimal transfer_bale_delivery_empty { get; set; }
public decimal abroad_inbound_delivery_empty { get; set; }
public decimal transfer_delivery_empty { get; set; }
} }
public class dc_average_warehouse_dto : dc_average_warehouse public class dc_average_warehouse_dto : dc_average_warehouse
......
...@@ -32,7 +32,7 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -32,7 +32,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
//report.ResetTransExpectArrivaltime(); //report.ResetTransExpectArrivaltime();
//dc_auto_return_goods_config_dao.NewCalculation(); //dc_auto_return_goods_config_dao.NewCalculation();
//PurchaseAverageTargetServices.Calculation("950282301", days: 360); //PurchaseAverageTargetServices.Calculation("950282301", days: 360);
//PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", 360); PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", 360);
//PurchaseAverageTargetServices.CalculationTransfer(days: (360 * 3),has_transfer:true); //PurchaseAverageTargetServices.CalculationTransfer(days: (360 * 3),has_transfer:true);
} }
catch (Exception ex) catch (Exception ex)
......
...@@ -511,6 +511,41 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp ...@@ -511,6 +511,41 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
WriteTransConfig(conn, skuItem, dataWarehouse); WriteTransConfig(conn, skuItem, dataWarehouse);
} }
#region 海运计算
var oceanlmsAvg = ApiUtility.GetLmsAvgOrderTransferList(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
{
transfer_type_val = 2,
logistics_code = dc_base_head_transport_config_data.logistics_code,
country = base_wa
}).GroupBy(s => new { s.order_no, s.logistics_code });
if (oceanlmsAvg != null && oceanlmsAvg.Count() >= 1)
{
dataWarehouse.transfer_bale_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
dataWarehouse.transfer_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
dataWarehouse.abroad_inbound_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
}
#endregion
#region 空运计算
var emptylmsAvg = ApiUtility.GetLmsAvgOrderTransferList(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
{
transfer_type_val = 3,
logistics_code = dc_base_head_transport_config_data.logistics_code,
country = base_wa
}).GroupBy(s => new { s.order_no, s.logistics_code });
if (emptylmsAvg != null && emptylmsAvg.Count() >= 1)
{
dataWarehouse.transfer_bale_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
dataWarehouse.transfer_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
dataWarehouse.abroad_inbound_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
}
#endregion
var lmsTransportCountDatas = ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto var lmsTransportCountDatas = ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto
{ {
bailun_sku = skuItem.bailun_sku, bailun_sku = skuItem.bailun_sku,
......
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