Skip to content

D
data-center-auto
Commit 31642d7f by 泽锋 李
Options

fix

parent cc5cee54
Showing with 49 additions and 25 deletions
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -1663,12 +1663,34 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
formula = $"【差值(空运)-实际周转金额占比】 = 【实际-空运周转金额差值 {modalData.quantity_final_air_difference_amount}】/ 【实际建议周转金额 {modalData.turnover_amount}】 "
});
modalData.freight_price_ocean_air_difference = modalData.freight_price_ocean - modalData.freight_price_air;
datas.FirstOrDefault(s => s.name == "海运-空运运费差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference,
formula = $"【海运-空运运费差值】= 【海运周转运费 {modalData.freight_price_ocean }】 - 【空运运周转运费 {modalData.freight_price_air}】"
});
modalData.quantity_final__ocean_air_difference_amount = modalData.quantity_final_advise_ocean_amount - modalData.quantity_final_advise_air_amount;
datas.FirstOrDefault(s => s.name == "海运-空运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.quantity_final__ocean_air_difference_amount,
formula = $"【海运-空运周转采购金额差值】= 【海运周转采购金额 {modalData.quantity_final_advise_ocean_amount }】 - 【空运运周转采购金额 {modalData.quantity_final_advise_air_amount}】"
});
modalData.freight_price_ocean_air_difference_radio = (modalData.turnover_amount) <= 0 ? 0M : (Math.Round((modalData.quantity_final__ocean_air_difference_amount) / modalData.turnover_amount, 3));
datas.FirstOrDefault(s => s.name == "差值(海运-空运)-实际周转金额占比").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference_radio,
formula = $"【差值(海运-空运)-实际周转金额占比】 = 【海运-空运周转金额差值 {modalData.quantity_final__ocean_air_difference_amount}】/ 【实际周转运费 {modalData.turnover_amount}】 "
});
result_data.today_data = modalData.ToJson().ToObj<transfer_profit_modal_dto>();
}
else // 过去
{
datas.FirstOrDefault(s => s.name == "30天预测销量实际-海运金额汇总").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
......@@ -1884,32 +1906,34 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
#endregion
}
modalData.freight_price_ocean_air_difference = modalData.freight_price_ocean - modalData.freight_price_air;
datas.FirstOrDefault(s => s.name == "海运-空运运费差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference,
formula = $"【海运-空运运费差值】= 【海运周转运费 {modalData.freight_price_ocean }】 - 【空运运周转运费 {modalData.freight_price_air}】"
});
modalData.freight_price_ocean_air_difference = modalData.freight_price_ocean - modalData.freight_price_air;
datas.FirstOrDefault(s => s.name == "海运-空运运费差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference,
formula = $"【海运-空运运费差值】= 【海运周转运费 {modalData.freight_price_ocean }】 - 【空运运周转运费 {modalData.freight_price_air}】"
});
modalData.quantity_final__ocean_air_difference_amount = modalData.quantity_final_advise_ocean_amount - modalData.quantity_final_advise_air_amount;
datas.FirstOrDefault(s => s.name == "海运-空运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.quantity_final__ocean_air_difference_amount,
formula = $"【海运-空运周转采购金额差值】= 【海运周转采购金额 {modalData.quantity_final_advise_ocean_amount }】 - 【空运运周转采购金额 {modalData.quantity_final_advise_air_amount}】"
});
modalData.quantity_final__ocean_air_difference_amount = modalData.quantity_final_advise_ocean_amount - modalData.quantity_final_advise_air_amount;
datas.FirstOrDefault(s => s.name == "海运-空运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.quantity_final__ocean_air_difference_amount,
formula = $"【海运-空运周转采购金额差值】= 【海运周转采购金额 {modalData.quantity_final_advise_ocean_amount }】 - 【空运运周转采购金额 {modalData.quantity_final_advise_air_amount}】"
});
modalData.freight_price_ocean_air_difference_radio = (modalData.turnover_amount) <= 0 ? 0M : (Math.Round((modalData.quantity_final__ocean_air_difference_amount) / modalData.turnover_amount, 3));
datas.FirstOrDefault(s => s.name == "差值(海运-空运)-实际周转金额占比").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference_radio,
formula = $"【差值(海运-空运)-实际周转金额占比】 = 【海运-空运周转金额差值 {modalData.quantity_final__ocean_air_difference_amount}】/ 【实际周转运费 {modalData.turnover_amount}】 "
modalData.freight_price_ocean_air_difference_radio = (modalData.turnover_amount) <= 0 ? 0M : (Math.Round((modalData.quantity_final__ocean_air_difference_amount) / modalData.turnover_amount, 3));
datas.FirstOrDefault(s => s.name == "差值(海运-空运)-实际周转金额占比").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.freight_price_ocean_air_difference_radio,
formula = $"【差值(海运-空运)-实际周转金额占比】 = 【海运-空运周转金额差值 {modalData.quantity_final__ocean_air_difference_amount}】/ 【实际周转运费 {modalData.turnover_amount}】 "
});
});
}
index++;
......@@ -2044,7 +2068,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
/// </summary>
public static void SynchroCalculationProfitAnalysis()
{
var task_name = $"SynchroCalculationProfitAnalysis_v12";
var task_name = $"SynchroCalculationProfitAnalysis_v13";
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 });
......
ResetOutofstock/Program.cs
......@@ -22,7 +22,7 @@ namespace ResetOutofstock
//dc_base_transfer_extend_dao.SynchroLmsTransferOrder();
//dc_base_supplier_dao.SynchroBailunLmsChannel();
//dc_base_trans_temp_schedule_dao.SynchroTransTempScheduleData(true);
//dc_auto_turnover.CalculationProfitAnalysis("946549801", "GB4PXBL");
//dc_auto_turnover.CalculationProfitAnalysis("LM-EO-007", "MMDUSFBA");
//dc_auto_turnover.SynchroCalculationProfitAnalysis();
//dc_auto_turnover.SynchroCalculationProfitAnalysis();
......
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