周转表导出新增配置交期

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -76,6 +76,7 @@ t13.quantity_transfer_order as 'quantity_transfer_order',
 t13.quantity_transfer_temp_schedule as 'quantity_transfer_temp_schedule',
 t13.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage',
 
+(case when t3.hq_type='国内仓' then t4.supplier_delivery else t4.transfer_delivery end  ) as 'supplier_delivery_config',
 
 t13.quantity_land_purchase as 'quantity_land_purchase',
 t13.quantity_ocean_purchase as 'quantity_ocean_purchase',
@@ -89,7 +90,10 @@ dat.dc_auto_sales_forecast_title,
 -- t14.title as 'dc_auto_sales_forecast_title',
 t4.`status` as 'sku_status'-- ,
 -- t11.label as 'sku_label'
--- ,t10.`name` as 'group_name'
+-- ,t10.`name` as 'group_name',
+
+
+
 from dc_auto_turnover as dat
 left join dc_auto_sales as t2 on t2.bailun_sku=dat.bailun_sku and dat.warehouse_code = t2.warehouse_code
 left join dc_base_warehouse as t3 on dat.warehouse_code = t3.warehouse_code

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -998,6 +998,7 @@ namespace AutoTurnOver.Models
         /// 供应商交期
         /// </summary>
         public int supplier_delivery { get; set; }
+        public int? supplier_delivery_config { get; set; }
 
         /// <summary>
         /// 调拨交运时长

AutoTurnOver.Models/dc_base_full_link_wait_order.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+    /// <summary>
+    /// 全链路在途订单
+    /// </summary>
+    public  class dc_base_full_link_wait_order
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Description(@"")]
+        public int id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Description(@"")]
+        public string bailun_sku { get; set; }
+
+      
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Description(@"")]
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Description(@"")]
+        public string bailun_sku_warehouse_code { get; set; }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        [Description(@"采购单号")]
+        public string purchase_no { get; set; }
+
+        /// <summary>
+        /// 调拨单号
+        /// </summary>
+        [Description(@"调拨单号")]
+        public string transfer_no { get; set; }
+
+        /// <summary>
+        /// 采购单创建时间
+        /// </summary>
+        [Description(@"采购单创建时间")]
+        public DateTime? purchase_create_time { get; set; }
+
+        /// <summary>
+        /// 采购单预计到货时间
+        /// </summary>
+        [Description(@"采购单预计到货时间")]
+        public DateTime? purchase_arrivaldate { get; set; }
+
+        /// <summary>
+        /// 采购单签收时间
+        /// </summary>
+        [Description(@"采购单签收时间")]
+        public DateTime? purchase_sign_time { get; set; }
+
+        /// <summary>
+        /// 采购单入库时间
+        /// </summary>
+        [Description(@"采购单入库时间")]
+        public DateTime? purchase_put_time { get; set; }
+
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        [Description(@"采购数量")]
+        public int? purchase_quantity { get; set; }
+
+        /// <summary>
+        /// 已采购到货数量
+        /// </summary>
+        [Description(@"已采购到货数量")]
+        public int? purchase_quantity_arrival { get; set; }
+
+        /// <summary>
+        /// 已采购入库数量
+        /// </summary>
+        [Description(@"已采购入库数量")]
+        public int? purchase_quantity_inbound { get; set; }
+
+        /// <summary>
+        /// 采购在途数量
+        /// </summary>
+        [Description(@"采购在途数量")]
+        public int? purchase_quantity_not_inbound { get; set; }
+
+        /// <summary>
+        /// 采购状态
+        /// </summary>
+        [Description(@"采购状态")]
+        public int? purchase_status { get; set; }
+
+        /// <summary>
+        /// 调拨单创建时间
+        /// </summary>
+        [Description(@"调拨单创建时间")]
+        public DateTime? transfer_create_time { get; set; }
+
+        /// <summary>
+        /// 调拨在途数量
+        /// </summary>
+        [Description(@"调拨在途数量")]
+        public int? transfer_quantity_not_inbound { get; set; }
+
+
+        /// <summary>
+        /// 调拨方式
+        /// </summary>
+        [Description(@"调拨方式")]
+        public string transfer_transporttype { get; set; }
+
+        /// <summary>
+        /// 物流渠道
+        /// </summary>
+        [Description(@"物流渠道")]
+        public string transfer_logistics_name { get; set; }
+
+        /// <summary>
+        /// 渠道编码
+        /// </summary>
+        [Description(@"渠道编码")]
+        public string transfer_logistics_code { get; set; }
+
+        /// <summary>
+        /// 目标到货时间
+        /// </summary>
+        [Description(@"目标到货时间")]
+        public DateTime? transfer_expectarrivaltime { get; set; }
+
+        /// <summary>
+        /// 调拨数量
+        /// </summary>
+        [Description(@"调拨数量")]
+        public int? transfer_quantity { get; set; }
+
+        /// <summary>
+        /// 调拨入库数量
+        /// </summary>
+        [Description(@"调拨入库数量")]
+        public int? transfer_put_quantity { get; set; }
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public DateTime update_date { get; set; }
+        public string transfer_plan_no { get; set; }
+        public string transfer_temp_schedule_no { get; set; }
+        public string transfer_temp_purchase_no { get; set; }
+    }
+
+
+    public class dc_base_full_link_wait_order_temp: dc_base_full_link_wait_order
+    {
+
+    }
+}

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -315,7 +315,8 @@ namespace AutoTurnOver.Services
                 ,"采购陆运在途数量","采购海运在途数量","采购空运在途数量","采购铁路在途数量"
                 ,"调拨陆运在途数量","调拨海运在途数量","调拨空运在途数量","调拨铁路在途数量","首次入库时间","供应链累计销量","销量预测规则","默认头程运输方式","默认头程渠道","计算时间",
                 "日均出单次数","首次出单日期","首次出单订单号",
-                "备货数量","产品类型","头程平均值取值来源","Walmart最近7天日均销量","Walmart最近14天日均销量","Walmart最近30天日均销量"
+                "备货数量","产品类型","头程平均值取值来源","Walmart最近7天日均销量","Walmart最近14天日均销量","Walmart最近30天日均销量",
+                "平均交期","配置交期"
             };
                 foreach (var item in cols)
                 {
@@ -325,6 +326,9 @@ namespace AutoTurnOver.Services
                 foreach (var itemData in list)
                 {
                     DataRow row = table.NewRow();
+                    row["平均交期"] = itemData.supplier_delivery;
+                    row["配置交期"] = itemData.supplier_delivery_config;
+
                     row["Walmart最近7天日均销量"] = itemData.history_sevenday_sales_walmart;
                     row["Walmart最近14天日均销量"] = itemData.history_fourteenday_sales_walmart;
                     row["Walmart最近30天日均销量"] = itemData.history_thirtyday_sales_walmart;

ResetOutofstock/Program.cs

@@ -33,6 +33,7 @@ namespace ResetOutofstock
                 //dc_base_mother_sku_dao.SynchroCalculationTurnOver();
                 //dc_base_mother_sku_dao.ResetTurnOver("M-test123", "MMDUSFBA");
                 //dc_base_transfer_extend_dao.SynchroLmsTransferOrder();
+                dc_base_full_link_wait_order_dao.ResetDatas();
             }
             catch (Exception ex)
             {