新增平均启航时间

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1152,6 +1152,11 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                 countSql += " and t1.order_type=@order_type ";
                 parameters.Add("order_type", searchData.order_type_str);
             }
+            if (searchData.order_type == 24)
+            {
+                sql += " and t1.sail_days>0 ";
+                countSql += " and t1.sail_days>0 ";
+            }
             sql += " limit " + offset + "," + limit;
             total = _connection.QueryFirstOrDefault<int>(countSql, parameters);
             return _connection.Query<dc_base_order_data_source_dto>(sql, parameters).AsList();

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -19,6 +19,10 @@ namespace AutoTurnOver.Models
         /// </summary>
         public string purchase_advice_id { get; set; }
         /// <summary>
+        /// 调拨启航天数
+        /// </summary>
+        public decimal transfer_sail_days { get; set; }
+        /// <summary>
         /// 销量预测公式
         /// </summary>
         public string sales_details_formula { get; set; }
@@ -188,12 +192,14 @@ namespace AutoTurnOver.Models
         /// 调拨打包天数
         /// </summary>
         public decimal transfer_bale_delivery { get; set; }
+
         public string transfer_bale_delivery_source { get; set; }
 
         /// <summary>
         /// 海外仓入库天数
         /// </summary>
         public decimal abroad_inbound_delivery { get; set; }
+
         public string abroad_inbound_delivery_source { get; set; }
 
         /// <summary>

AutoTurnOver.Models/dc_base_order_data_source.cs

@@ -78,7 +78,7 @@ namespace AutoTurnOver.Models
                 {
                     return "采购单-下单天数计算";
                 }
-                else if (order_type == 21 || order_type == 22 || order_type == 23 )
+                else if (order_type == 21 || order_type == 22 || order_type == 23 || order_type == 24 )
                 {
                     return "调拨单-平均天数计算";
                 }