fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1381,6 +1381,8 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     modalData.transfer_delivery = result.transfer_delivery;
                     modalData.abroad_inbound_delivery = result.abroad_inbound_delivery;
                     modalData.transfer_bale_delivery = result.transfer_bale_delivery;
+                    modalData.transfer_order_days = result.transfer_order_days;
+                    modalData.sail_days = result.sail_days;
 
                    
 
@@ -1393,12 +1395,14 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     modalData.transfer_delivery_air = result_air.transfer_delivery;
                     modalData.abroad_inbound_delivery_air = result_air.abroad_inbound_delivery;
                     modalData.transfer_bale_delivery_air = result_air.transfer_bale_delivery;
+                    modalData.sail_days_air = result_air.sail_days;
+                    modalData.transfer_order_days_air = result_air.transfer_order_days;
                     datas.FirstOrDefault(s => s.name == "空运周转天数").days.Add(new transfer_profit_dto.day_dto
                     {
                         has_int = true,
                         date = this_time,
                         val = result_air.turnover_days,
-                        formula = $" 【空运周转天数】 = 供应链长度( {result_air.turnover_days} ) = 下单天数( {result_air.purchase_create_order_days} ) + 财务付款时间( {result_air.payment_before_delivery} ) + 供应商交期( {result_air.supplier_delivery} ) + 质检入库天数( {result_air.inspection_delivery} ) + 调拨启航等待天数( 0 ) + 调拨头程天数( {result_air.transfer_delivery} ) + 海外仓入库天数( {result_air.abroad_inbound_delivery} ) + 调拨打包天数( {result_air.transfer_bale_delivery} )"
+                        formula = $" 【空运周转天数】 = 供应链长度( {result_air.turnover_days} ) = 下单天数( {result_air.purchase_create_order_days} ) + 财务付款时间( {result_air.payment_before_delivery} ) + 供应商交期( {result_air.supplier_delivery} ) + 质检入库天数( {result_air.inspection_delivery} ) + 调拨打包天数( {result_air.transfer_bale_delivery}  + 调拨下单天数( {result_air.transfer_bale_delivery} + 调拨启航等待天数(  {result_air.sail_days} ) + 调拨头程天数( {result_air.transfer_order_days} ) + 海外仓入库天数( {result_air.abroad_inbound_delivery} )  )"
                     });
 
                     modalData.turnover_days_ocean = result_ocean.turnover_days;
@@ -1408,13 +1412,15 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     modalData.inspection_delivery_days_ocean = result_ocean.inspection_delivery;
                     modalData.transfer_delivery_ocean = result_ocean.transfer_delivery;
                     modalData.abroad_inbound_delivery_ocean = result_ocean.abroad_inbound_delivery;
-                    modalData.transfer_bale_delivery_ocean = result_ocean.transfer_bale_delivery;
+                    modalData.transfer_order_days_ocean = result_ocean.transfer_bale_delivery;
+                    modalData.transfer_order_days_ocean = result_ocean.transfer_order_days;
+                    modalData.sail_days_ocean = result_ocean.sail_days;
                     datas.FirstOrDefault(s => s.name == "海运周转天数").days.Add(new transfer_profit_dto.day_dto
                     {
                         has_int = true,
                         date = this_time,
                         val = result_ocean.turnover_days,
-                        formula = $" 【空运周转天数】 = 供应链长度( {result_ocean.turnover_days} ) = 下单天数( {result_ocean.purchase_create_order_days} ) + 财务付款时间( {result_ocean.payment_before_delivery} ) + 供应商交期( {result_ocean.supplier_delivery} ) + 质检入库天数( {result_ocean.inspection_delivery} ) + 调拨启航等待天数( 0 ) + 调拨头程天数( {result_ocean.transfer_delivery} ) + 海外仓入库天数( {result_ocean.abroad_inbound_delivery} ) + 调拨打包天数( {result_ocean.transfer_bale_delivery} )"
+                        formula = $" 【海运周转天数】 = 供应链长度( {result_ocean.turnover_days} ) = 下单天数( {result_ocean.purchase_create_order_days} ) + 财务付款时间( {result_ocean.payment_before_delivery} ) + 供应商交期( {result_ocean.supplier_delivery} ) + 质检入库天数( {result_ocean.inspection_delivery} ) + 调拨启航等待天数( 0 ) + 调拨头程天数( {result_ocean.transfer_delivery} ) + 海外仓入库天数( {result_ocean.abroad_inbound_delivery} ) + 调拨打包天数( {result_ocean.transfer_bale_delivery} )"
                     });
 
                     modalData.unit_price = dc_base_sku_data.unit_price;

AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs

@@ -222,7 +222,7 @@ namespace AutoTurnOver.Models.Report
         public int inspection_delivery_days_ocean;
         public int transfer_delivery_ocean;
         public decimal abroad_inbound_delivery_ocean;
-        public decimal transfer_bale_delivery_ocean;
+        public decimal transfer_order_days_ocean;
         public decimal turnover_sales;
         /// <summary>
         /// 调拨时长总销量
@@ -281,6 +281,10 @@ namespace AutoTurnOver.Models.Report
         /// 30 天空运-实际运费差额 / 库存金额
         /// </summary>
         public decimal freight_stock_amount_air_30;
+        public int sail_days_air;
+        public int transfer_order_days_air;
+        public int transfer_order_days;
+        public int sail_days;
 
         /// <summary>
         /// 实际建议周转运费

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -143,6 +143,8 @@ namespace AutoTurnOver.Models
         /// 调拨交运时长
         /// </summary>
         public int transfer_delivery { get; set; }
+        public int transfer_order_days { get; set; }
+        public int sail_days { get; set; }
 
         /// <summary>
         /// 质检入库时长