fix

AutoGeneratePurchaseAdvise/Program.cs

@@ -21,7 +21,7 @@ namespace AutoGeneratePurchaseAdvise
                 //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
                 //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
 
-                //PurchaseAdviseServices.GenerateTemp(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 15:30:00")));
+                //PurchaseAdviseServices.GenerateTemp(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 17:17:00")));
                 //PurchaseAdviseServices.AutoPushBuySys(2);
 
                 //PurchaseAdviseServices.AutoPushBuySys(1);
@@ -32,6 +32,7 @@ namespace AutoGeneratePurchaseAdvise
                 //report.ResetTransExpectArrivaltime();
                 //PurchaseAdviseServices.AutoPushBuySys(1);
                 //report.PurchaseWeekBackUp();
+                //report.ResetTransExpectArrivaltime();
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/report.cs

@@ -4062,16 +4062,17 @@ and t3.hq_type='fba仓' and t2.expectarrivaltime >='1991-01-01'").ToList();
 
             // 计算国内入库，还没有调拨单的数据
             var temp_p_datas = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
-t1.purchase_id, 
-t1.bailun_sku,
-t1.warehouse_into_code as 'warehouse_code' ,
-t1.quantity_inbound as 'count',
+t1.purchase_code as 'purchase_id', 
+t1.sku as 'bailun_sku',
+t1.target_ware_no as 'warehouse_code' ,
+t1.product_num as 'count',
 '' as 'transfer_order_id',
 '1991-01-01' as 'expectarrivaltime'
-from dc_base_purchase_details as t1 
-left join dc_base_warehouse as t2 on t1.warehouse_into_code = t2.warehouse_code
-where  t1.quantity_purchase<=t1.quantity_inbound and t1.`status` not in (-1) and t2.hq_type='fba仓'
-and t1.create_time>=@btime ",new { btime = DateTime.Now.AddMonths(-3)}).ToList();
+from dc_base_trans_temp_schedule as t1 
+left join dc_base_warehouse as t2 on t1.target_ware_no = t2.warehouse_code
+where  t1.product_num>0 and t1.is_delete=0 and t1.is_temp_data=1 and t1.is_exception=0 and t2.hq_type='fba仓'
+
+ ").ToList();
 
             // 查询已经有调拨的采购单
             foreach (var item in temp_p_datas.GroupBy(s=>s.purchase_id))

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -26,7 +26,9 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 //PurchaseAverageTargetServices.CalculationTransfer("942517901");
                 //report.ResetTransExpectArrivaltime();
 
-                report.ResetTransExpectArrivaltime();
+                //report.ResetTransExpectArrivaltime();
+
+                PurchaseAverageTargetServices.CalculationTransfer("944913201");
             }
             catch (Exception ex)
             {

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -144,6 +144,7 @@ namespace AutoTurnOver.Services
 
         public static void CalculationTransfer(string bailun_sku  ="")
         {
+      
             MyMySqlConnection conn = connectionHelper._connection;
 
             var task_log = new dc_task_log
@@ -163,7 +164,11 @@ namespace AutoTurnOver.Services
                 var chageSkuList = AveragePurchase.GetTransferChangeSku(30, bailun_sku);
                 foreach (var skuItem in chageSkuList)
                 {
-                    var base_wa = conn.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ",new { skuItem.warehouse_code});
+                    if (skuItem.warehouse_code== "MMDUSFBA")
+                    {
+
+                    }
+                        var base_wa = conn.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ",new { skuItem.warehouse_code});
 
                     var purchaseWList = AveragePurchase.GetPurchaseListByWode(skuItem, _seed_count).ToList();
 
@@ -258,7 +263,13 @@ namespace AutoTurnOver.Services
                     country = base_wa
                     });
 
-                    if (lmsAvg != null && lmsAvg.Count>=1)
+                    if (lmsAvg != null && lmsAvg.Count >= 3)
+                    {
+                        dataWarehouse.transfer_bale_delivery = 1;
+                        dataWarehouse.transfer_delivery =( (lmsAvg.Sum(s => s.avg_sign_days)- lmsAvg.Max(s=>s.avg_sign_days)-lmsAvg.Min(s=>s.avg_sign_days))/ (lmsAvg.Count-2));
+                        dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Sum(s => s.avg_put_days) - lmsAvg.Max(s => s.avg_put_days) - lmsAvg.Min(s => s.avg_put_days)) / (lmsAvg.Count - 2)); 
+                    }
+                    else  if (lmsAvg != null && lmsAvg.Count>=1)
                     {
                         dataWarehouse.transfer_bale_delivery = 1;
                         dataWarehouse.transfer_delivery = lmsAvg.Select(s=>s.avg_sign_days).Average();