fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1308,11 +1308,13 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                 // 预测未来
                 if (this_time_end >= now)
                 {
-                    modalData.freight_unit_price = _connection.QueryFirstOrDefault<decimal?>(" select freight_unit_price from dc_base_transfer_freight where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku limit 1 ", new
+                    var dc_base_transfer_freight_data = _connection.QueryFirstOrDefault<dc_base_transfer_freight>(" select freight_unit_price from dc_base_transfer_freight where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku limit 1 ", new
                     {
                         warehouse_code = result.warehouse_code,
                         bailun_sku = result.bailun_sku
-                    }) ?? 0;
+                    }) ?? new dc_base_transfer_freight { };
+                    modalData.freight_unit_price = dc_base_transfer_freight_data.freight_unit_price;
+                    modalData.freight_unit_price_formula = dc_base_transfer_freight_data.formula;
                     datas.FirstOrDefault(s => s.name == "实际运费单价").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -1320,6 +1322,8 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $" 历史调拨单费用平均值 "
                     });
 
+                    //modalData.transfer_sales = advised_details.Where((s,index)=> { }).Sum();
+
                     //30天周转数
                     modalData.quantity_final_advise_30 = sales30;
                     modalData.freight_price_30 = sales30 * modalData.freight_unit_price;
@@ -1372,6 +1376,9 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     modalData.abroad_inbound_delivery = result.abroad_inbound_delivery;
                     modalData.transfer_bale_delivery = result.transfer_bale_delivery;
 
+                   
+
+                    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;

AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs

@@ -55,6 +55,11 @@ namespace AutoTurnOver.Models.Report
         public decimal freight_unit_price;
 
         /// <summary>
+        /// 实际运费计算公式
+        /// </summary>
+        public string freight_unit_price_formula;
+
+        /// <summary>
         /// 30天实际销量
         /// </summary>
         public decimal sales30;
@@ -214,6 +219,18 @@ namespace AutoTurnOver.Models.Report
         public decimal abroad_inbound_delivery_ocean;
         public decimal transfer_bale_delivery_ocean;
         public decimal turnover_sales;
+        /// <summary>
+        /// 调拨时长总销量
+        /// </summary>
+        public decimal transfer_sales { get; set; }
+        /// <summary>
+        /// 调拨时长总销量 （空运）
+        /// </summary>
+        public decimal transfer_sales_air { get; set; }
+        /// <summary>
+        /// 调拨时长总销量 （海运）
+        /// </summary>
+        public decimal transfer_sales_ocean { get; set; }
         public int turnover_days_air;
         public decimal freight_price_air_ocean_30_difference;
         /// <summary>
@@ -221,6 +238,15 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public decimal quantity_safe_inventory_days;
         public int turnover_days;
+
+        /// <summary>
+        /// 调拨时间段天数 (空运)
+        /// </summary>
+        public int transfer_days_air { get; set; }
+        /// <summary>
+        /// 调拨时间段天数 （还要）
+        /// </summary>
+        public int transfer_days_ocean { get; set; }
         public int purchase_create_order_days;
         public int payment_before_delivery;
         public int supplier_delivery;

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -82,6 +82,7 @@ namespace AutoTurnOver.Models
         /// </summary>
         public int turnover_days { get; set; }
 
+
         /// <summary>
         /// 安全库存
         /// </summary>
@@ -213,6 +214,7 @@ namespace AutoTurnOver.Models
         public decimal turnover_sales { get; set; }
        
   
+
         /// <summary>
         /// 周转期内总入库
         /// </summary>

ResetOutofstock/Program.cs

@@ -28,7 +28,6 @@ namespace ResetOutofstock
             }
             catch (Exception ex)
             {
-
                 throw;
             }