fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1894,6 +1894,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
             var profit_data = TransferProfitList(bailun_sku, warehouse_code, DateTime.Now).today_data;
             profit_data.ocean_purchase = Math.Max(0, profit_data.quantity_final_advise_ocean - profit_data.turnover);
             profit_data.ocean_purchase_amount = profit_data.ocean_purchase * profit_data.unit_price;
+            profit_data.freight_stock_amount_ocean = profit_data.quantity_final_ocean_difference_amount <= 0 ? 0 : ((profit_data.freight_price_ocean_difference_amount) / (profit_data.quantity_final_ocean_difference_amount));
+            profit_data.freight_stock_amount_air = profit_data.quantity_final_air_difference_amount <= 0 ? 0 : ((profit_data.freight_price_air_difference_amount) / (profit_data.quantity_final_air_difference_amount));
+            profit_data.freight_stock_amount_ocean_30 = profit_data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_ocean_30_difference) / profit_data.quantity_final_advise_amount);
+            profit_data.freight_stock_amount_air_30 = profit_data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_air_30_difference) / profit_data.quantity_final_advise_amount);
             var formula_json = profit_data.ToJson();
             dc_report_profit_analysis data = formula_json.ToObj<dc_report_profit_analysis>();
             data.bailun_sku = bailun_sku;
@@ -1935,10 +1939,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
                 etime1 = DateTime.Now.AddDays(-1).ToDayEnd(),
             }, commandTimeout: 0) ?? 0) / 180;
 
-            data.freight_stock_amount_ocean = data.quantity_final_ocean_difference_amount <= 0 ? 0 : ((data.freight_price_ocean_difference_amount) / (data.quantity_final_ocean_difference_amount));
-            data.freight_stock_amount_air = data.quantity_final_air_difference_amount <= 0 ? 0 : ((data.freight_price_air_difference_amount) / (data.quantity_final_air_difference_amount));
-            data.freight_stock_amount_ocean_30 = data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(data.freight_price_ocean_30_difference) / data.quantity_final_advise_amount);
-            data.freight_stock_amount_air_30 = data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(data.freight_price_air_30_difference) / data.quantity_final_advise_amount);
+            
 
             data.id = _connection.QueryFirstOrDefault<int?>(" select id from dc_report_profit_analysis where bailun_sku=@bailun_sku and  warehouse_code=@warehouse_code ", new
             {
@@ -1962,7 +1963,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
         /// </summary>
         public static void SynchroCalculationProfitAnalysis()
         {
-            var task_name = $"SynchroCalculationProfitAnalysis_v6";
+            var task_name = $"SynchroCalculationProfitAnalysis_v7";
             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 });

AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs

@@ -266,6 +266,23 @@ namespace AutoTurnOver.Models.Report
         public decimal transfer_bale_delivery;
 
         /// <summary>
+        /// 海运-实际运费差额 / 库存金额差值
+        /// </summary>
+        public decimal freight_stock_amount_ocean;
+        /// <summary>
+        /// 空运-实际运费差额 / 库存金额差值
+        /// </summary>
+        public decimal freight_stock_amount_air;
+        /// <summary>
+        /// 30 天海运-实际运费差额 / 库存金额差值
+        /// </summary>
+        public decimal freight_stock_amount_ocean_30;
+        /// <summary>
+        /// 30 天空运-实际运费差额 / 库存金额差值
+        /// </summary>
+        public decimal freight_stock_amount_air_30;
+
+        /// <summary>
         /// 实际建议周转运费
         /// </summary>
         //public decimal quantity_final_advise_freight;