重抓数据

AutoTurnOver.DB/AveragePurchase.cs

@@ -109,16 +109,35 @@ where t1.supplier_id = t2.suppliers_id  ";
         /// <returns></returns>
         public static IEnumerable<dc_base_purchase_dto> GetPurchaseList(temp_sku_dto skuData, int seed_count)
         {
-            DynamicParameters parameters = new DynamicParameters();
-            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
+            if (skuData.hq_type == "国内仓")
+            {
+                DynamicParameters parameters = new DynamicParameters();
+                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
+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
+where t1.buy_status=4 and t1.bailun_sku=@bailun_sku and t2.bailun_sku=@bailun_sku and t1.supplier_id=@supplier_id  and t2.last_signtime > '2010-01-01' and t3.hq_type='国内仓'
+ORDER BY t1.update_time desc LIMIT @seed_count
+ ", parameters);
+            }
+            else
+            {
+                DynamicParameters parameters = new DynamicParameters();
+                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
 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
-where t1.buy_status=4 and t1.bailun_sku=@bailun_sku and t2.bailun_sku=@bailun_sku and t1.supplier_id=@supplier_id  and t2.last_signtime > '2010-01-01'
+left join dc_base_warehouse as t3 on  t1.warehouse_code = t3.warehouse_code
+where t1.buy_status=4 and t1.bailun_sku=@bailun_sku and t2.bailun_sku=@bailun_sku and t1.supplier_id=@supplier_id  and t2.last_signtime > '2010-01-01' and t3.hq_type!='国内仓'
 ORDER BY t1.update_time desc LIMIT @seed_count
  ", parameters);
+            }
+          
 
 
         }

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -258,8 +258,21 @@ namespace AutoTurnOver.Models.ApiDto
         public string transport_type { get; set; }
         public decimal sign_days { get; set; }
         public decimal put_days { get; set; }
+        public DateTime shipping_time { get; set; }
         public DateTime sign_time { get; set; }
         public DateTime put_time { get; set; }
+        public DateTime create_date { get; set; }
+        public decimal calculation_sign_days { get {
+                return (decimal)(sign_time - shipping_time).TotalHours / 24;
+            } }
+        public decimal calculation_put_days
+        { get {
+                return (decimal)(put_time - sign_time).TotalHours / 24;
+            } }
+        public decimal calculation_bale_days
+        { get {
+                return (decimal)(shipping_time - create_date).TotalHours / 24;
+            } }
     }
 
     public class api_lms_order_transfer_sku_requst_dto

AutoTurnOver.Models/dc_base_order_data_source.cs

@@ -19,6 +19,13 @@ namespace AutoTurnOver.Models
         public string logistics_code { get; set; }
         public string logistics_name { get; set; }
         public string transport_type { get; set; }
+        public DateTime? pay_time { get; set; }
+        public string pay_type { get; set; }
+        public DateTime? confirm_time { get; set; }
+        public DateTime? sign_time { get; set; }
+        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_search_dto

AutoTurnOver.Purchase.AverageTarget/Program.cs

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

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -105,7 +105,12 @@ namespace AutoTurnOver.Services
                                 order_type = "采购单-签收天数计算",
                                 put_days = 0,
                                 sign_days = temp_s_delivery_days,
-                                transport_type = ""
+                                transport_type = "",
+                                confirm_time = tempPurchase.confirm_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)
                             });
                         }
 
@@ -272,7 +277,9 @@ namespace AutoTurnOver.Services
                                         order_type = "采购单-质检入库天数计算",
                                         put_days = (decimal)Math.Ceiling((itemLms.Max(s=>s.update_time) - itemLms.Max(s=>s.arrival_time)).TotalHours / 24),
                                         sign_days = 0,
-                                        transport_type = ""
+                                        transport_type = "",
+                                        sign_time = itemLms.Max(s => s.arrival_time),
+                                        put_time = itemLms.Max(s => s.update_time)
                                     });
                                 }
 
@@ -348,22 +355,9 @@ namespace AutoTurnOver.Services
 
                         if (lmsAvg != null && lmsAvg.Count() >= 1)
                         {
-                            dataWarehouse.transfer_bale_delivery = 1;
-                            dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.FirstOrDefault().sign_days).Average();
-                        }
-
-                        if (lmsAvg.Count() >= 3 && false)
-                        {
-                           // dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.put_days != null).Sum(s => s.put_days) - lmsAvg.Max(s => s.put_days) - lmsAvg.Min(s => s.put_days)) / (lmsAvg.Count - 2));
-                        }
-                        else if (lmsAvg.Count() >= 1)
-                        {
-
-                            dataWarehouse.abroad_inbound_delivery = lmsAvg.Select(s => s.FirstOrDefault().put_days).Average();
-                        }
-                        else
-                        {
-                            dataWarehouse.abroad_inbound_delivery = 0;
+                            dataWarehouse.transfer_bale_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
+                            dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
+                            dataWarehouse.abroad_inbound_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                         }
 
                         // 清空记录，重新记录数据源
@@ -382,13 +376,17 @@ namespace AutoTurnOver.Services
                                     warehouse_code = skuItem.warehouse_code,
                                     logistics_code = itemLms.FirstOrDefault().logistics_code,
                                     bailun_sku_warehouse_code = $"{skuItem.bailun_sku}{skuItem.warehouse_code}",
-                                    bale_days = 1,
+                                    bale_days = itemLms.FirstOrDefault().calculation_bale_days,
                                     logistics_name = itemLms.FirstOrDefault().logistics_name,
                                     order_no = itemLms.Key.order_no,
                                     order_type = "调拨单-平均天数计算",
                                     put_days = itemLms.FirstOrDefault().put_days,
                                     sign_days = itemLms.FirstOrDefault().sign_days,
-                                    transport_type = itemLms.FirstOrDefault().transport_type
+                                    transport_type = itemLms.FirstOrDefault().transport_type,
+                                    put_time = itemLms.FirstOrDefault().put_time,
+                                    sign_time = itemLms.FirstOrDefault().sign_time,
+                                    shipping_time = itemLms.FirstOrDefault().shipping_time,
+                                    create_date = itemLms.FirstOrDefault().create_date,
                                 });
                             }
                         }