利润分析新增空运占比

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1725,6 +1725,18 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                 }
                 else // 过去
                 {
+                    var average_warehouse_data = _connection.QueryFirstOrDefault<dc_average_warehouse>(" select * from dc_average_warehouse where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku limit 1 ", new
+                    {
+                        warehouse_code = result.warehouse_code,
+                        bailun_sku = result.bailun_sku
+                    }) ?? new dc_average_warehouse { };
+                    modalData.product_count = average_warehouse_data.product_count;
+                    modalData.product_count_3 = average_warehouse_data.product_count_3;
+                    modalData.order_count = average_warehouse_data.order_count;
+                    modalData.order_count_3 = average_warehouse_data.order_count_3;
+                    modalData.order_count_3_radio = modalData.order_count <= 0 ? 0 : modalData.order_count_3 / modalData.order_count;
+                    modalData.product_count_3_radio = modalData.product_count <= 0 ? 0 : modalData.product_count_3 / modalData.product_count;
+
                     datas.FirstOrDefault(s => s.name == "30天预测销量实际-海运金额汇总").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -2110,7 +2122,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
         /// </summary>
         public static void SynchroCalculationProfitAnalysis()
         {
-            var task_name = $"SynchroCalculationProfitAnalysis_v18";
+            var task_name = $"SynchroCalculationProfitAnalysis_v19";
             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 });