海外仓统计表，新增总销售数量、总销售金额(RMB)、总销售成本(RMB)

AutoTurnOver.DB/report.cs

@@ -2960,12 +2960,9 @@ where 1=1
             var week_tag = $"{btime.ToString("MM-dd")} ~ {etime.ToString("MM-dd")}";
             _connection.Execute(@"
 delete from dc_report_stock_week where week_tag=@week_tag;
-insert into dc_report_stock_week(`stock`,`week_tag`,`warehouse_code`,`bailun_sku`,`first_day_date`,`web_site`,`sku_tag`,`stock_amount`,`is_order`)
+insert into dc_report_stock_week(`stock`,`week_tag`,`warehouse_code`,`bailun_sku`,`first_day_date`,`web_site`,`sku_tag`,`stock_amount`,`is_order`,`sales`,`sales_amount`,`cost_amount`)
 (
-
-									 
-									 
-									 select 
+select 
 t1.stock,
 t1.week_tag,
 t1.warehouse_code,
@@ -2974,7 +2971,10 @@ t1.first_day_date,
 t1.web_site,
 t1.sku_tag,
 t1.stock_amount,
-1 as 'is_order'
+1 as 'is_order',
+t1.sales,
+t1.sales_amount,
+t1.cost_amount
 from (select 
 t3.usable_stock as 'stock',
 @week_tag as 'week_tag',
@@ -2984,13 +2984,16 @@ t1.bailun_sku,
 t2.area_name as 'web_site',
 '' as 'sku_tag',
 t3.usable_stock * ifnull(t4.unit_price,0) 'stock_amount',
-t2.hq_type
+t2.hq_type,
+sum(t1.bailun_sku_quantity_ordered) as 'sales',
+sum(t1.bailun_sku_quantity_ordered * t1.amount_sales * t1.seller_order_exchange_rate) as 'sales_amount',
+sum(t1.cost_product * t1.amount_sales ) as 'cost_amount'
 from dc_base_oms_sku as t1
 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
 left join dc_base_stock t3 on t1.bailun_sku = t3.bailun_sku and t1.warehouse_code = t3.warehouse_code
 left join dc_base_sku as t4 on t1.bailun_sku = t4.bailun_sku
 where t1.paid_time>=@btime and t1.paid_time<=@etime 
-and t1.bailun_order_status = 'Handling'
+and t1.bailun_order_status != 'Canceled'
                    and t1.bailun_interception_status in ('None', 'Failed')
                    and t1.warehouse_code != ''
                    and t1.platform_type != 'FBA'
@@ -3005,7 +3008,7 @@ and t1.bailun_order_status = 'Handling'
 group by t1.warehouse_code,t1.bailun_sku  ) as t1
 where t1.hq_type='第三方仓库'
 );
-insert ignore into dc_report_stock_week(`stock`,`week_tag`,`warehouse_code`,`bailun_sku`,`first_day_date`,`web_site`,`sku_tag`,`stock_amount`,`is_order`)
+insert ignore into dc_report_stock_week(`stock`,`week_tag`,`warehouse_code`,`bailun_sku`,`first_day_date`,`web_site`,`sku_tag`,`stock_amount`,`is_order`,`sales`,`sales_amount`,`cost_amount`)
 (
 select 
t1.usable_stock as 'stock',
 @week_tag as 'week_tag',
@@ -3015,7 +3018,10 @@ t1.bailun_sku,
 t2.area_name as 'web_site',
 '' as 'sku_tag',
 t1.usable_stock * ifnull(t3.unit_price,0) 'stock_amount',
-0 as 'is_order'
+0 as 'is_order',
+0 as 'sales',
+0 as 'sales_amount',
+0 as 'cost_amount'
 from dc_base_stock as t1
 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
@@ -3067,6 +3073,9 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                 r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "清货", weeks = new List<report_stock_week_view_dto.week>() { } });
                 r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "美容SKU", weeks = new List<report_stock_week_view_dto.week>() { } });
                 r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "总SKU数", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "总销售数量", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "总销售金额(RMB)", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "总销售成本(RMB)", weeks = new List<report_stock_week_view_dto.week>() { } });
 
                 var this_date = btime.GetWeekFirstDayMon().ToDayHome();
                 while (this_date <= etime)
@@ -3078,6 +3087,9 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                     var sum_val = this_datas.Count();
                     var sum_stock_val = this_datas.Sum(s=>s.stock);
                     var sum_stock_amount_val = this_datas.Sum(s=>s.stock_amount);
+                    var sum_sales_val = this_datas.Sum(s=>s.sales);
+                    var sum_sales_amount_val = this_datas.Sum(s=>s.sales_amount);
+                    var sum_cost_amount_amount_val = this_datas.Sum(s=>s.cost_amount);
                     var chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==1).Count();
                     var bu_chudan_sku_val = (decimal)this_datas.Where(s => s.is_order==0).Count();
                     var chudan_sku_stock_val = (decimal)this_datas.Where(s => s.is_order==1).Sum(s=>s.stock);
@@ -3087,8 +3099,10 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                     var jinzhun_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "普货-精准开发").Count();
                     var qinhuo_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "清货").Count();
                     var meirong_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "美容SKU").Count();
-                    
 
+
+                   
+                    
                     r_datas.SingleOrDefault(s => s.web_site== websiteGroupItem.Key && s.tag == "出单sku数量占比").weeks.Add(new report_stock_week_view_dto.week
                     {
                         tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
@@ -3156,6 +3170,25 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                         ratio = 1
                     });
 
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "总销售数量").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = sum_sales_val,
+                        ratio = 1M
+                    });
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "总销售金额(RMB)").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = sum_sales_amount_val,
+                        ratio = 1M
+                    });
+
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "总销售成本(RMB)").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $" {b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = sum_cost_amount_amount_val,
+                        ratio = 1M
+                    });
 
                     this_date = this_date.AddDays(7);
                 }

AutoTurnOver.Models/Report/report_stock_week_view_dto.cs

@@ -43,6 +43,9 @@ namespace AutoTurnOver.Models.Report
         public string web_site { get; set; }
         public string sku_tag { get; set; }
         public decimal stock_amount { get; set; }
+        public decimal sales { get; set; }
+        public decimal sales_amount { get; set; }
+        public decimal cost_amount { get; set; }
         public int is_order { get; set; }
     }
 

ResetOutofstock/Program.cs

@@ -18,7 +18,7 @@ namespace ResetOutofstock
                 var now = DateTime.Now;
                 //report.ResetCashFlowData();
                 //report.StockWeekBackUp();
-                report.PurchaseWeekBackUp();
+                //report.PurchaseWeekBackUp();
                 //report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
                 //report_cash_flow_dao.SynchroTransferCost();
             }