Commit 7643c006 by 泽锋 李

刷新调拨单数据

parent 0f892b2f
...@@ -898,6 +898,20 @@ group by t1.transfer_order_id,t1.box_id ...@@ -898,6 +898,20 @@ group by t1.transfer_order_id,t1.box_id
{ {
var occur_time = order_item.creationtime; var occur_time = order_item.creationtime;
var platforms = GetPlatformShare(occur_time, conn, inventoryConfigs, order_item.warehouse_code, order_item_sku.bailun_sku); var platforms = GetPlatformShare(occur_time, conn, inventoryConfigs, order_item.warehouse_code, order_item_sku.bailun_sku);
// 查询是否有真实费用
var is_real = 0;
var real_cost = order_item_sku.cost_first;
var real_data = conn.QuerySingleOrDefault<dc_base_transfer_cost_real>(" select * from dc_base_transfer_cost_real where bailun_sku=@bailun_sku and transfer_order_id=@transfer_order_id ",new {
bailun_sku = order_item_sku.bailun_sku,
transfer_order_id = order_item.transfer_order_id
});
if (real_data != null)
{
is_real = 1;
real_cost = real_data.sku_avg_cost;
}
if (platforms != null && platforms.Count >= 1) if (platforms != null && platforms.Count >= 1)
{ {
// 把原本未挂载平台的数据删除 // 把原本未挂载平台的数据删除
...@@ -923,11 +937,12 @@ group by t1.transfer_order_id,t1.box_id ...@@ -923,11 +937,12 @@ group by t1.transfer_order_id,t1.box_id
platform_type = platformItem.platform_type, platform_type = platformItem.platform_type,
web_site = platformItem.web_stie, web_site = platformItem.web_stie,
remarks = $" 原本调拨费用 {order_item_sku.cost_first} 该平台站点 日均加权销量 {platformItem.sales_weight} 占比 {platformItem.ratio} ", remarks = $" 原本调拨费用 {order_item_sku.cost_first} 该平台站点 日均加权销量 {platformItem.sales_weight} 占比 {platformItem.ratio} ",
val = 0 - (Math.Abs(order_item_sku.cost_first) * platformItem.ratio), val = 0 - (Math.Abs(real_cost) * platformItem.ratio),
occur_time = occur_time, occur_time = occur_time,
warehouse_code = order_item.warehouse_code, warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付, pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = $"{order_item.unique_no}-{platformItem.platform_type}-{platformItem.web_stie}" item_no = $"{order_item.unique_no}-{platformItem.platform_type}-{platformItem.web_stie}",
is_real =is_real
}; };
var remarks = ""; var remarks = "";
item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks); item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
...@@ -967,11 +982,12 @@ group by t1.transfer_order_id,t1.box_id ...@@ -967,11 +982,12 @@ group by t1.transfer_order_id,t1.box_id
platform_type = "", platform_type = "",
web_site = "", web_site = "",
remarks = "", remarks = "",
val = 0 - Math.Abs(order_item_sku.cost_first), val = 0 - Math.Abs(real_cost),
occur_time = order_item.creationtime, occur_time = order_item.creationtime,
warehouse_code = order_item.warehouse_code, warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付, pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = order_item.unique_no item_no = order_item.unique_no,
is_real =is_real
}; };
var remarks = ""; var remarks = "";
item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks); item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
......
...@@ -61,6 +61,7 @@ namespace AutoTurnOver.Models ...@@ -61,6 +61,7 @@ namespace AutoTurnOver.Models
public DateTime update_time { get; set; } public DateTime update_time { get; set; }
public string pay_time_year_month_no { get; set; } public string pay_time_year_month_no { get; set; }
public string occur_time_year_month_no { get; set; } public string occur_time_year_month_no { get; set; }
public int is_real { get; set; }
} }
public class old_cash_flow_dto public class old_cash_flow_dto
......
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