fix

AutoTurnOver.DB/AveragePurchase.cs

@@ -115,7 +115,8 @@ where t1.supplier_id = t2.suppliers_id  ";
                 parameters.Add("bailun_sku", skuData.bailun_sku);
                 parameters.Add("supplier_id", skuData.supplier_id);
                 parameters.Add("seed_count", seed_count);
-                return _connection.Query<dc_base_purchase_dto>(@"select t1.price,t1.bailun_sku,t1.warehouse_code,t1.purchase_id,t1.warehouse_name,t1.count,t1.sku_name,t1.supplier_id,t1.supplier_name,t1.confirm_time,t1.pay_time,t1.pay_type,t2.last_signtime
+                return _connection.Query<dc_base_purchase_dto>(@"select t1.price,t1.bailun_sku,t1.warehouse_code,t1.purchase_id,
+t1.warehouse_name,t1.count,t1.sku_name,t1.supplier_id,t1.supplier_name,t1.confirm_time,t1.pay_time,t1.pay_type,t2.last_signtime,t1.create_time as 'create_time'
 from dc_base_purchase as t1
 left join dc_base_purchase_details as t2 on  t1.purchase_id = t2.purchase_id and t1.bailun_sku=t2.bailun_sku
 left join dc_base_warehouse as t3 on  t1.warehouse_code = t3.warehouse_code
@@ -129,7 +130,8 @@ ORDER BY t1.update_time desc LIMIT @seed_count
                 parameters.Add("bailun_sku", skuData.bailun_sku);
                 parameters.Add("supplier_id", skuData.supplier_id);
                 parameters.Add("seed_count", seed_count);
-                return _connection.Query<dc_base_purchase_dto>(@"select t1.price,t1.bailun_sku,t1.warehouse_code,t1.purchase_id,t1.warehouse_name,t1.count,t1.sku_name,t1.supplier_id,t1.supplier_name,t1.confirm_time,t1.pay_time,t1.pay_type,t2.last_signtime
+                return _connection.Query<dc_base_purchase_dto>(@"select t1.price,t1.bailun_sku,t1.warehouse_code,t1.purchase_id,
+t1.warehouse_name,t1.count,t1.sku_name,t1.supplier_id,t1.supplier_name,t1.confirm_time,t1.pay_time,t1.pay_type,t2.last_signtime,t1.create_time as 'create_time'
 from dc_base_purchase as t1
 left join dc_base_purchase_details as t2 on  t1.purchase_id = t2.purchase_id and t1.bailun_sku=t2.bailun_sku
 left join dc_base_warehouse as t3 on  t1.warehouse_code = t3.warehouse_code

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1029,7 +1029,7 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime
         /// 获取数据来源
         /// </summary>
         /// <returns></returns>
-        public static List<dc_base_order_data_source> GetOrderDataSource(dc_base_order_data_source_search_dto searchData, int offset, int limit, ref int total)
+        public static List<dc_base_order_data_source_dto> GetOrderDataSource(dc_base_order_data_source_search_dto searchData, int offset, int limit, ref int total)
         {
             var sql = " select * from dc_base_order_data_source as t1 where 1=1 ";
             var countSql = " select count(1) from dc_base_order_data_source as t1 where 1=1 ";
@@ -1054,7 +1054,7 @@ from dc_auto_turnover where gmt_modified>=@btime and gmt_modified<=@etime
             }
             sql += " limit " + offset + "," + limit;
             total = _connection.QueryFirstOrDefault<int>(countSql, parameters);
-            return _connection.Query<dc_base_order_data_source>(sql, parameters).AsList();
+            return _connection.Query<dc_base_order_data_source_dto>(sql, parameters).AsList();
         }
 
         /// <summary>

AutoTurnOver.Models/dc_base_order_data_source.cs

@@ -26,6 +26,34 @@ namespace AutoTurnOver.Models
         public DateTime? put_time { get; set; }
         public DateTime? shipping_time { get; set; }
         public DateTime? create_date { get; set; }
+
+     
+    }
+
+    public class dc_base_order_data_source_dto: dc_base_order_data_source
+    {
+        public string date_line_str
+        {
+            get
+            {
+                if (order_type.Contains("采购单"))
+                {
+                    if (pay_type == "先货后款")
+                    {
+                        return $" 创建时间【{create_date}】 ~  采购员确认【{confirm_time}】~ 签收【{sign_time}】 ~ 入库 【{put_time}】  ";
+                    }
+                    else
+                    {
+                        return $" 创建时间【{create_date}】 ~  付款【{pay_time}】~ 签收【{sign_time}】 ~ 入库 【{put_time}】  ";
+                    }
+
+                }
+                else
+                {
+                    return $" 创建时间【{create_date}】 ~  交运【{shipping_time}】~ 签收【{sign_time}】 ~ 入库 【{put_time}】  ";
+                }
+            }
+        }
     }
 
     public class dc_base_order_data_source_search_dto

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -32,7 +32,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //report.ResetTransExpectArrivaltime();
                 //dc_auto_return_goods_config_dao.NewCalculation();
                 //PurchaseAverageTargetServices.Calculation("217632401", days: 360);
-                //PurchaseAverageTargetServices.CalculationTransfer("217632401", 360);
+               // PurchaseAverageTargetServices.CalculationTransfer("217632401", 360);
             }
             catch (Exception ex)
             {

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -66,7 +66,7 @@ namespace AutoTurnOver.Services
 
                     //查出来的采购单数量
                     var purchase_order_count = purchaseList.Select(s => s.purchase_id).Distinct().Count();
-
+                    var inboundList = AveragePurchase.GetInboundList(purchaseList.Select(s => s.purchase_id), skuItem.bailun_sku).ToList();
                     //有相关采购单 (要至少有3个单，才算平均数)
                     if (purchaseList != null && purchase_order_count >= 3)
                     {
@@ -94,6 +94,7 @@ namespace AutoTurnOver.Services
                                 temp_s_delivery_days = (int)Math.Ceiling((itemArrivalList.Min(s => s.last_signtime) - tempPurchase.confirm_time).Value.TotalHours / 24);
                             }
                             delivery_days += temp_s_delivery_days;
+
                             conn.Insert(new dc_base_order_data_source
                             {
                                 bailun_sku = skuItem.bailun_sku,
@@ -108,10 +109,11 @@ namespace AutoTurnOver.Services
                                 sign_days = temp_s_delivery_days,
                                 transport_type = "",
                                 confirm_time = tempPurchase.confirm_time,
-                                create_date  = tempPurchase.create_time,
+                                create_date = tempPurchase.create_time,
                                 pay_time = tempPurchase.pay_time,
                                 pay_type = (tempPurchase.pay_type == 1?"先款后货":"先货后款"),
-                                sign_time = itemArrivalList.Min(s => s.last_signtime)
+                                sign_time = itemArrivalList.Min(s => s.last_signtime),
+                                put_time =( inboundList.OrderByDescending(s=>s.update_time).FirstOrDefault(s=>s.purchase_id== itemArrivalList.Key)??new Models.dc_base_purchase.dc_base_purchase_inbound_dto()).update_time
                             });
                         }
 
@@ -276,6 +278,7 @@ namespace AutoTurnOver.Services
                             {
                                 foreach (var itemLms in inboundList.GroupBy(s=>s.purchase_id))
                                 {
+                                    var puData = purchaseWList.FirstOrDefault(s => s.purchase_id == itemLms.Key);
                                     conn.Insert(new dc_base_order_data_source
                                     {
                                         bailun_sku = skuItem.bailun_sku,
@@ -290,7 +293,11 @@ namespace AutoTurnOver.Services
                                         sign_days = 0,
                                         transport_type = "",
                                         sign_time = itemLms.Max(s => s.arrival_time),
-                                        put_time = itemLms.Max(s => s.update_time)
+                                        put_time = itemLms.Max(s => s.update_time),
+                                        confirm_time = puData.confirm_time,
+                                        create_date = puData.create_time,
+                                        pay_time = puData.pay_time,
+                                        pay_type = (puData.pay_type == 1 ? "先款后货" : "先货后款")
                                     });
                                 }
 

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -36,7 +36,7 @@ namespace AutoTurnOver.Services
             return DB.dc_auto_turnover.List(m,offset, limit, ref total,order,sort, isSum);
         } 
         
-        public List<dc_base_order_data_source> GetOrderDataSource(dc_base_order_data_source_search_dto m,int offset, int limit, ref int total)
+        public List<dc_base_order_data_source_dto> GetOrderDataSource(dc_base_order_data_source_search_dto m,int offset, int limit, ref int total)
         {
             return DB.dc_auto_turnover.GetOrderDataSource(m,offset, limit, ref total);
         }