海外仓汇总，新增类目出单数量占比

AutoTurnOver.DB/report.cs

@@ -2994,7 +2994,8 @@ left join dc_base_stock t3 on t1.bailun_sku = t3.bailun_sku and t1.warehouse_cod
 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 != 'Canceled'
-                   and t1.bailun_interception_status in ('None', 'Failed')
+                     and t1.bailun_sku_quantity_picked>0
+                   -- and t1.bailun_interception_status in ('None', 'Failed','Part')
                    and t1.warehouse_code != ''
                    and t1.platform_type != 'FBA'
                    and t1.company_id = 1
@@ -3069,9 +3070,12 @@ 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 = "不出单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 = "不出单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 = "普货-精准开发", 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 = "清货-出单数量占比", 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 = "总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>() { } });
@@ -3097,12 +3101,16 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                     var chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==1).Sum(s=>s.stock_amount);
                     var bu_chudan_sku_stock_amount_val = (decimal)this_datas.Where(s => s.is_order==0).Sum(s => s.stock_amount);
                     var jinzhun_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "普货-精准开发").Count();
+                    var jinzhun_sku_order_val = (decimal)this_datas.Where(s => s.is_order==1 && 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();
+                    var qinhuo_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && s.sku_tag== "清货").Count();
+                    var meirong_sku_val = (decimal)this_datas.Where(s => s.sku_tag== "美容SKU").Count(); 
+                    var meirong_sku_order_val = (decimal)this_datas.Where(s => s.is_order == 1 && 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")}",
@@ -3151,17 +3159,34 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                         val = jinzhun_sku_val,
                         ratio = jinzhun_sku_val.Division(sum_val)
                     });
+                    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 = jinzhun_sku_order_val,
+                        ratio = jinzhun_sku_order_val.Division(jinzhun_sku_val)
+                    });
                     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 = qinhuo_sku_val,
                         ratio = qinhuo_sku_val.Division(sum_val)
                     });
+                    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 = qinhuo_sku_order_val,
+                        ratio = qinhuo_sku_order_val.Division(qinhuo_sku_val)
+                    });
                     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")}",
                         val = meirong_sku_val,
                         ratio = meirong_sku_val.Division(sum_val)
+                    }); 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")}",
+                        val = meirong_sku_order_val,
+                        ratio = meirong_sku_order_val.Division(meirong_sku_val)
                     });
                     r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "总SKU数").weeks.Add(new report_stock_week_view_dto.week
                     {