fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1332,10 +1332,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
             new transfer_profit_dto{field_name ="quantity_final_advise_air_amount",  name ="空运周转金额",remarks = "空运周转数 * 采购价",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_air",  name ="空运周转运费",remarks="空运周转数 * 最便宜的空运物流跑出来的运费单价 ",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_ocean_difference_amount",  name ="实际-海运运费差值",remarks = "【实际周转运费】-【海运周转运费】",days = new List<transfer_profit_dto.day_dto>()},
-            new transfer_profit_dto{field_name ="quantity_final_ocean_difference_amount",  name ="实际-海运周转采购金额差值",remarks = "【实际建议周转金额】-【海运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
+            new transfer_profit_dto{field_name ="quantity_final_ocean_difference_amount",  name ="实际-海运周转采购金额差值",remarks = "【实际周转金额】-【海运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_ocean_difference_amount_radio",  name ="差值(海运)-实际周转金额占比",remarks = "【实际-海运运费差值】/ 【实际周转运费】",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_air_difference_amount",  name ="实际-空运运费差值",remarks="【实际周转运费】-【空运周转运费】",days = new List<transfer_profit_dto.day_dto>()},
-            new transfer_profit_dto{field_name ="quantity_final_air_difference_amount",  name ="实际-空运周转采购金额差值",remarks = "【实际建议周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
+            new transfer_profit_dto{field_name ="quantity_final_air_difference_amount",  name ="实际-空运周转采购金额差值",remarks = "【实际周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_air_difference_amount_radio",  name ="差值(空运)-实际周转金额占比",remarks = "【实际-空运运费差值】/ 【实际周转运费】",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="freight_price_ocean_air_difference",  name ="海运-空运运费差值",remarks="【海运周转运费】-【空运运周转运费】",days = new List<transfer_profit_dto.day_dto>()},
             new transfer_profit_dto{field_name ="quantity_final__ocean_air_difference_amount",  name ="海运-空运周转采购金额差值",remarks="【海运周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
@@ -1642,12 +1642,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $"【实际-海运运费差值】= 【实际周转运费 {modalData.freight_price }】 - 【海运周转运费 {modalData.freight_price_ocean}】"
                     });
 
-                    modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_ocean_amount;
+                    modalData.quantity_final_ocean_difference_amount = modalData.turnover_amount - modalData.quantity_final_advise_ocean_amount;
                     datas.FirstOrDefault(s => s.name == "实际-海运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
                         val = modalData.quantity_final_ocean_difference_amount,
-                        formula = $"【实际-海运周转采购金额差值】= 【实际建议周转金额 {modalData.quantity_final_advise_amount }】 - 【海运周转金额 {modalData.quantity_final_advise_ocean_amount}】"
+                        formula = $"【实际-海运周转采购金额差值】= 【实际周转金额 {modalData.turnover_amount }】 - 【海运周转金额 {modalData.quantity_final_advise_ocean_amount}】"
                     });
 
                     modalData.freight_price_ocean_difference_amount_radio = (modalData.turnover_amount) <= 0 ? 0M : (Math.Round((modalData.quantity_final_ocean_difference_amount) / modalData.turnover_amount, 3));
@@ -1667,12 +1667,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $"【实际-空运运费差值】= 【实际周转运费 {modalData.freight_price }】 - 【空运运周转运费 {modalData.freight_price_air}】"
                     });
 
-                    modalData.quantity_final_air_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_air_amount;
+                    modalData.quantity_final_air_difference_amount = modalData.turnover_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_air_difference_amount,
-                        formula = $"【实际-空运运周转采购金额差值】= 【实际建议周转金额 {modalData.quantity_final_advise_amount }】 - 【空运周转金额 {modalData.quantity_final_advise_air_amount}】"
+                        formula = $"【实际-空运运周转采购金额差值】= 【实际建议周转金额 {modalData.turnover_amount }】 - 【空运周转金额 {modalData.quantity_final_advise_air_amount}】"
 
                     });
                     modalData.freight_price_air_difference_amount_radio = (modalData.turnover_amount) <= 0 ? 0M : (Math.Round((modalData.quantity_final_air_difference_amount) / modalData.turnover_amount, 3));
@@ -2094,7 +2094,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
         /// </summary>
         public static void SynchroCalculationProfitAnalysis()
         {
-            var task_name = $"SynchroCalculationProfitAnalysis_v17";
+            var task_name = $"SynchroCalculationProfitAnalysis_v18";
             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 });