上周销量的计算，去除fba 和 国内仓的限制

AutoGeneratePurchaseAdvise/Program.cs

@@ -22,7 +22,7 @@ namespace AutoGeneratePurchaseAdvise
                 //purchase_advise.WaitReplaceLogisticsTask();
                 //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("2020-11-27 19:40:00")));
                 //PurchaseAdviseServices.AutoPushBuySys(6);
-                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
+                //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/report.cs

@@ -2073,15 +2073,10 @@ where t1.bailun_sku =t2.bailun_sku and t1.warehouse_code =t2.warehouse_code",com
         public static void ResetLastweekData()
         {
             _connection.Execute(@" -- 刷新 sku 上周销量
-set session transaction isolation level read uncommitted;
-start transaction;
-
 -- 清空视图表的数据
 Truncate table dc_base_lastweek_data_temp;
-
-insert into dc_base_lastweek_data_temp(`bailun_sku`,  `warehouse_code`,  `sales`,`sales_amount`)
-
-select t1.bailun_sku,t1.warehouse_code, 
+ ", commandTimeout: 0);
+            var datas = _connection.Query<dc_base_lastweek_data_temp>(@"select t1.bailun_sku,t1.warehouse_code, 
 sum(t1.bailun_sku_quantity_ordered) as 'sales',
 sum(t1.bailun_sku_quantity_ordered * t1.amount_sales * t1.order_to_usd_exchange_rate) as 'sales_amount'
 from dc_base_oms_sku t1
@@ -2089,16 +2084,25 @@ join dc_base_oms_order t2 on t1.bailun_order_id=t2.bailun_order_id and t2.has_sc
 left join dc_base_oms_pick t3 on t1.bailun_order_id=t3.bailun_order_id and t1.bailun_sku=t3.bailun_sku and t3.has_delete=0
 left join dc_base_sku t4 on t1.bailun_sku=t4.bailun_sku
 left join dc_base_sku_source t5 on t4.source = t5.source
-join dc_base_warehouse t6 on t3.warehouse_code=t6.warehouse_code and t6.hq_type!='国内仓'
+join dc_base_warehouse t6 on t3.warehouse_code=t6.warehouse_code 
 where t1.has_delete=0 and t1.company_id=1 and t2.bailun_order_status!='Canceled' 
-and (t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') 
-and t2.paid_time>=@btime and t2.paid_time<@etime 
-GROUP BY t1.bailun_sku,t1.warehouse_code;
+and ( t1.bailun_order_status!='CantHandle') 
+and t2.paid_time>=@btime and t2.paid_time<@etime
+GROUP BY t1.bailun_sku,t1.warehouse_code ", new { btime = DateTime.Now.AddDays(-7).GetWeekFirstDayMon().ToDayHome(), etime = DateTime.Now.AddDays(-7).GetWeekLastDaySun().ToDayEnd() }).ToList();
 
+            if (datas != null)
+            {
+                foreach (var item in datas)
+                {
+                    _connection.Insert<dc_base_lastweek_data_temp>(item);
+                }
+            }
+            
+            _connection.Execute(@" 
 alter table dc_base_lastweek_data rename dc_base_lastweek_dataTemp; 
 alter table dc_base_lastweek_data_temp rename dc_base_lastweek_data; 
 alter table dc_base_lastweek_dataTemp rename dc_base_lastweek_data_temp; 
-truncate table dc_base_lastweek_data_temp; ", new { btime = DateTime.Now.AddDays(-7).GetWeekFirstDayMon().ToDayHome(), etime = DateTime.Now.AddDays(-7).GetWeekLastDaySun().ToDayEnd() }, commandTimeout: 0);
+truncate table dc_base_lastweek_data_temp; ", commandTimeout: 0);
         }
 
         public static void ResetCashFlowData()

AutoTurnOver.Models/Report/dc_base_lastweek_data.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.Report
+{
+    public class dc_base_lastweek_data_temp
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string bailun_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 销量
+        /// </summary>
+        public decimal sales { get; set; }
+
+        /// <summary>
+        /// 销售金额 美金
+        /// </summary>
+        public decimal sales_amount { get; set; }
+    }
+}

ResetOutofstock/Program.cs

@@ -22,6 +22,7 @@ namespace ResetOutofstock
                 //report.PurchaseWeekBackUp();
                 //report.ResetOmsOutofstock();
                 //report.CalculationSalesTrend();
+                //report.ResetLastweekData();
             }
             catch (Exception ex)
             {