Skip to content

D
data-center-auto
Commit 2b7f6745 by 泽锋 李
Options

刷新调拨单数据

parent cf8cc608
Showing with 9 additions and 6 deletions
AutoTurnOver.DB/report_cash_flow_dao.cs
......@@ -903,7 +903,7 @@ group by t1.transfer_order_id,t1.box_id
conn.Execute(" delete from dc_report_cash_flow_log where data_type=@data_type and bailun_sku=@bailun_sku and `no`=@transfer_order_id ", new
{
bailun_sku = order_item_sku.bailun_sku,
transfer_order_id = order_item.transfer_order_id,
transfer_order_id = order_item.unique_no,
data_type = (int)dc_report_cash_flow_log_data_type_enum.新增头程费用_首单
});
......@@ -918,7 +918,7 @@ group by t1.transfer_order_id,t1.box_id
is_delete = (order_item.isdeleted == 1) ? 1 : 0,
item = order_item.transfer_order_id,
update_time = now,
no = order_item.transfer_order_id,
no = order_item.unique_no,
platform_type = platformItem.platform_type,
web_site = platformItem.web_stie,
remarks = $" 原本调拨费用 {order_item_sku.cost_first} 该平台站点 日均加权销量 {platformItem.sales_weight} 占比 {platformItem.ratio} ",
......@@ -926,7 +926,7 @@ group by t1.transfer_order_id,t1.box_id
occur_time = occur_time,
warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = $"{order_item.transfer_order_id}-{platformItem.platform_type}-{platformItem.web_stie}"
item_no = $"{order_item.unique_no}-{platformItem.platform_type}-{platformItem.web_stie}"
};
var remarks = "";
item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
......@@ -960,9 +960,9 @@ group by t1.transfer_order_id,t1.box_id
bailun_sku = order_item_sku.bailun_sku,
data_type = (int)dc_report_cash_flow_log_data_type_enum.新增头程费用_首单,
is_delete = (order_item.isdeleted == 1) ? 1 : 0,
item = order_item.transfer_order_id,
item = order_item.unique_no,
update_time = now,
no = order_item.transfer_order_id,
no = order_item.unique_no,
platform_type = "",
web_site = "",
remarks = "",
......@@ -970,7 +970,7 @@ group by t1.transfer_order_id,t1.box_id
occur_time = order_item.creationtime,
warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
item_no = order_item.transfer_order_id
item_no = order_item.unique_no
};
var remarks = "";
item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
......
AutoTurnOver.Models/Report/dc_base_transfer_verify.cs
......@@ -163,6 +163,9 @@ namespace AutoTurnOver.Models.Report
public string transfer_order_id { get; set; }
public string warehouse_code { get; set; }
public decimal sum_cost_first { get; set; }
public string unique_no { get {
return transfer_order_id + $"[box:{box_id}]";
} }
}
......
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