fix

AutoGeneratePurchaseAdvise/Program.cs

@@ -21,6 +21,7 @@ namespace AutoGeneratePurchaseAdvise
             
             try
             {
+                //PurchaseAdviseServices.AutoPushBuySys(2);
                 //PurchaseAdviseServices.Generate($"早上的全量周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")), is_clear_data: true);
                 //PurchaseAdviseServices.Generate($"早上的全量周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")), is_clear_data: false);
                 //PurchaseAdviseServices.Generate($"下午的补充周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));

AutoTurnOver.DB/AveragePurchase.cs

@@ -53,7 +53,7 @@ where t1.`update_time`>=@c_time
             {
                 // 初始化数据才会进啦
                 sql += " and t2.hq_type='fba仓'  ";
-                sql += " and not EXISTS ( select * from dc_average_warehouse as ta where t1.warehouse_code  =ta.warehouse_code and t1.bailun_sku =ta.bailun_sku and (ta.update_time>'2021-04-02 11:00:00' ) ) ";
+                sql += " and not EXISTS ( select * from dc_average_warehouse as ta where t1.warehouse_code  =ta.warehouse_code and t1.bailun_sku =ta.bailun_sku and (ta.update_time>'2021-05-11 15:50:00' ) ) ";
                 //sql += "  and EXISTS ( select * from dc_report_profit_analysis as ta where t1.warehouse_code  =ta.warehouse_code and t1.bailun_sku =ta.bailun_sku  ) ";
             }
             sql += " group by t1.bailun_sku,t1.warehouse_code ";

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -297,6 +297,8 @@ namespace AutoTurnOver.Models.ApiDto
         public string transfer_type { get; set; }
         public int? transfer_type_val { get; set; }
         public string logistics_code { get; set; }
+
+        public int? is_fba { get; set; }
     }
 
 }

AutoTurnOver.Purchase.AverageTarget/AverageTargetBackgrounService.cs

@@ -22,7 +22,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 try
                 {
                     Console.WriteLine($"开始  init ，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                    //PurchaseAverageTargetServices.CalculationTransfer(days:(360*3),has_transfer:true);
+                    PurchaseAverageTargetServices.CalculationTransfer(days:(360*3),has_transfer:true);
                     Console.WriteLine($"结束 init，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
                 catch (Exception ex)
@@ -37,7 +37,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 try
                 {
                     Console.WriteLine($"开始  init2 ，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                    PurchaseAverageTargetServices.Calculation(days:(360*3));
+                    //PurchaseAverageTargetServices.Calculation(days:(360*3));
                     Console.WriteLine($"结束 init2，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
                 catch (Exception ex)

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -24,7 +24,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
             try
             {
                 //report.ResetTransExpectArrivaltime();
-                //PurchaseAverageTargetServices.CalculationTransfer("945333401", days: (360 * 3));
+                //PurchaseAverageTargetServices.CalculationTransfer("227290401", days: (360 * 3));
 
                 //PurchaseAverageTargetServices.Calculation("LM-EO-007", days: (360 * 3)); 
                 //ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "949057402", targetwareno= "MMDUSFBA" });

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -461,7 +461,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             {
                                 endCountries = base_wa,
                                 character_skus = skuItem.bailun_sku,
-                                startPoint = "3",
+                                startPoint = "3"
                             });
                             if (logisticsDatas != null && logisticsDatas.Count >= 1)
                             {
@@ -479,7 +479,8 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             transfer_type_val = transfer_type,
                             //warehouse_code = skuItem.warehouse_code,
                             logistics_code = dc_base_head_transport_config_data.logistics_code,
-                            country = base_wa
+                            country = base_wa,
+                            is_fba = "FBA仓".Equals(skuItem.hq_type, StringComparison.InvariantCultureIgnoreCase) ? 1 : 0
                         }).GroupBy(s => new { s.order_no, s.logistics_code });
 
                         if (lmsAvg != null && lmsAvg.Count() >= 1)
@@ -541,7 +542,8 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                         {
                             transfer_type_val = 2,
                             logistics_code = dc_base_head_transport_config_data.logistics_code,
-                            country = base_wa
+                            country = base_wa,
+                            is_fba = "FBA仓".Equals(skuItem.hq_type, StringComparison.InvariantCultureIgnoreCase) ? 1 : 0
                         }).GroupBy(s => new { s.order_no, s.logistics_code });
 
                         if (oceanlmsAvg != null && oceanlmsAvg.Count() >= 1)
@@ -565,7 +567,8 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                         {
                             transfer_type_val = 3,
                             logistics_code = dc_base_head_transport_config_data.logistics_code,
-                            country = base_wa
+                            country = base_wa,
+                            is_fba = "FBA仓".Equals(skuItem.hq_type, StringComparison.InvariantCultureIgnoreCase) ? 1 : 0
                         }).GroupBy(s => new { s.order_no, s.logistics_code });
 
                         if (emptylmsAvg != null && emptylmsAvg.Count() >= 1)