fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1322,7 +1322,13 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $" 历史调拨单费用平均值 "
                     });
 
-                    //modalData.transfer_sales = advised_details.Where((s,index)=> { }).Sum();
+                    modalData.transfer_days_air = result_air.transfer_delivery + ((int)Math.Ceiling(result_air.abroad_inbound_delivery)) + ((int)Math.Ceiling(result_air.transfer_bale_delivery));
+                    modalData.transfer_days = result.transfer_delivery + ((int)Math.Ceiling(result.abroad_inbound_delivery)) + ((int)Math.Ceiling(result.transfer_bale_delivery));
+                    modalData.transfer_days_ocean = result_ocean.transfer_delivery + ((int)Math.Ceiling(result_ocean.abroad_inbound_delivery)) + ((int)Math.Ceiling(result_ocean.transfer_bale_delivery));
+
+                    modalData.transfer_sales = advised_details.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days)).Sum();
+                    modalData.transfer_sales_air = advised_details_air.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_air)).Sum();
+                    modalData.transfer_sales_ocean = advised_details_ocean.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_ocean)).Sum();
 
                     //30天周转数
                     modalData.quantity_final_advise_30 = sales30;
@@ -1378,7 +1384,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
 
                    
 
-                    modalData.transfer_days_air = result_air.transfer_delivery+ ((int)Math.Ceiling( result_air.abroad_inbound_delivery))+ ((int)Math.Ceiling(result_air.transfer_bale_delivery));
+                   
                     modalData.turnover_days_air = result_air.turnover_days;
                     modalData.purchase_create_order_days_air = result_air.purchase_create_order_days ?? 0;
                     modalData.payment_before_delivery_air = result_air.payment_before_delivery;
@@ -1453,12 +1459,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $" 【实际周转数】 = 采购+调拨在途 （{quantity_transfer + quantity_purchase}） + 在库 （{dc_stock_data}） "
                     });
 
-                    modalData.freight_price = modalData.freight_unit_price * modalData.turnover;
+                    modalData.freight_price = dc_base_transfer_freight_data.freight; ;
                     datas.FirstOrDefault(s => s.name == "实际周转运费").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
                         val = modalData.freight_price,
-                        formula = $" 【实际周转运费】 = 【平均运费单价 {modalData.freight_unit_price}】 * 【实际周转数 {modalData.turnover}】  "
+                        formula = dc_base_transfer_freight_data.formula
                     });
 
                     // 实际建议周转运费
@@ -1483,7 +1489,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         val = modalData.quantity_final_advise_ocean_amount,
                         formula = $" 【海运周转金额】 =  【海运周转数（推荐海运）{modalData.quantity_final_advise_ocean}】* 【采购单价 {modalData.unit_price}】"
                     });
-                    modalData.freight_price_ocean = Math.Round((modalData.quantity_final_advise_ocean) * modalData.freight_unit_price_ocean, 2);
+                    modalData.freight_price_ocean = Math.Round((modalData.transfer_sales_ocean) * modalData.freight_unit_price_ocean, 2);
                     modalData.cean_line_name = logoCeanData.Line_Name;
                     modalData.cean_line_freight_unit_price = (logoCeanData.min_freight_unit_price ?? 0) / (logoCeanData.min_freight_unit_weight ?? 1);
                     modalData.weight = dc_base_sku_data.weight / 1000;
@@ -1491,7 +1497,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     {
                         date = this_time,
                         val = modalData.freight_price_ocean,
-                        formula = $"  【海运周转运费】= 【海运周转数（推荐海运）{modalData.quantity_final_advise_ocean}】* 【（最近90天内发过的最便宜的海运物流 {logoCeanData.Line_Name} 运费单价 {logoCeanData.min_freight_unit_price / (logoCeanData.min_freight_unit_weight ?? 1) }/kg ）* 产品重量 （{dc_base_sku_data.weight / 1000} kg ）】 "
+                        formula = $"  【海运周转运费】= 【海运周转数（推荐海运）{modalData.transfer_sales_ocean}】* 【（最近90天内发过的最便宜的海运物流 {logoCeanData.Line_Name} 运费单价 {logoCeanData.min_freight_unit_price / (logoCeanData.min_freight_unit_weight ?? 1) }/kg ）* 产品重量 （{dc_base_sku_data.weight / 1000} kg ）】 "
                     });
 
                     modalData.quantity_final_advise_air = (int)Math.Round(result_air.turnover_sales + result_air.quantity_safe_inventory);
@@ -1509,7 +1515,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         val = modalData.quantity_final_advise_air_amount,
                         formula = $" 【空运周转金额】 =  【空运周转数（推荐空运）{modalData.quantity_final_advise_air}】* 【采购单价 {modalData.unit_price}】"
                     });
-                    modalData.freight_price_air = Math.Round((modalData.quantity_final_advise_air) * modalData.freight_unit_price_air, 2);
+                    modalData.freight_price_air = Math.Round((modalData.transfer_sales_air) * modalData.freight_unit_price_air, 2);
                     modalData.air_line_name = logoAirData.Line_Name;
                     modalData.air_line_freight_unit_price = (logoAirData.min_freight_unit_price ?? 0) / (logoAirData.min_freight_unit_weight ?? 1);
                     datas.FirstOrDefault(s => s.name == "空运周转运费").days.Add(new transfer_profit_dto.day_dto

AutoTurnOver.DB/dc_base_transfer_freight_dao.cs

@@ -226,7 +226,7 @@ where t1.`code`=@code limit 1
                     freight_unit_price = data_log.freight_unit_price,
                     freight = data_log.freight,
                     update_time = DateTime.Now,
-                    formula = data_log.formula
+                    formula = data_log.formula??""
 
                 };
                 mainData.id = _connection.QuerySingleOrDefault<int?>(" select id from dc_base_transfer_freight where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new

AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs

@@ -243,6 +243,11 @@ namespace AutoTurnOver.Models.Report
         /// 调拨时间段天数 (空运)
         /// </summary>
         public int transfer_days_air { get; set; }
+
+        /// <summary>
+        ///  调拨时间段天数 
+        /// </summary>
+        public int transfer_days { get; set; }
         /// <summary>
         /// 调拨时间段天数 （还要）
         /// </summary>

ResetOutofstock/Program.cs

@@ -25,6 +25,7 @@ namespace ResetOutofstock
                 //dc_auto_turnover.CalculationProfitAnalysis("LM-EO-007", "MMDUSFBA");
                 //dc_auto_turnover.SynchroCalculationProfitAnalysis();
                 //dc_base_transfer_freight_dao.CalculationSingle("LM-EO-007", "MMDUSFBA");
+                //dc_base_transfer_freight_dao.Init();
             }
             catch (Exception ex)
             {