fix

AutoTurnOver.DB/report.cs

@@ -1362,6 +1362,8 @@ t1.bailun_sku,
  when t1.buyer_name='赵美聪' then '服装供应商推荐'
  when t1.buyer_name!='赵美聪' and t1.source = 1 and t1.create_time>='2019-07-01 00:00:00' then '非服装精准开发'
  when t1.buyer_name='李华娟'  then '无库普货推荐'
+ when t1.buyer_name='张莹霞'  then '美甲'
+ when t1.buyer_name='张莹霞1'  then '精油'
  else '未知'
  end
 ) as 'label'
@@ -1729,7 +1731,7 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
                 datas.Add(new bailun_sku_website_sales_dto
                 {
                     label = "总计",
-                    labels = new List<string> { "服装精准开发", "服装供应商推荐", "非服装精准开发" },
+                    labels = new List<string> { "服装精准开发", "服装供应商推荐", "非服装精准开发", "无库普货推荐" },
                     website = "总计",
                     website_show = "总计",
                     platform_type = "总计",
@@ -1781,6 +1783,7 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
                     platform_type = search_data.platform_type,
                     days = new List<bailun_sku_website_sales_dto.bailun_sku_website_sales_date_dto>()
                 });
+
                 foreach (var item in website_list)
                 {
                     datas.Add(new bailun_sku_website_sales_dto
@@ -1802,6 +1805,7 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
                     platform_type = search_data.platform_type,
                     days = new List<bailun_sku_website_sales_dto.bailun_sku_website_sales_date_dto>()
                 });
+
                 foreach (var item in website_list)
                 {
                     datas.Add(new bailun_sku_website_sales_dto
@@ -1823,6 +1827,28 @@ truncate table dc_auto_stock_monitor_temp;   ", commandTimeout: 0);
                     platform_type = search_data.platform_type,
                     days = new List<bailun_sku_website_sales_dto.bailun_sku_website_sales_date_dto>()
                 });
+
+                foreach (var item in website_list)
+                {
+                    datas.Add(new bailun_sku_website_sales_dto
+                    {
+                        label = "无库普货推荐",
+                        labels = new List<string> { "无库普货推荐" },
+                        website = item.Key.website,
+                        website_show = item.Key.platform_type + "-" + item.Key.website,
+                        platform_type = item.Key.platform_type,
+                        days = new List<bailun_sku_website_sales_dto.bailun_sku_website_sales_date_dto>()
+                    });
+                }
+                datas.Add(new bailun_sku_website_sales_dto
+                {
+                    label = "无库普货推荐",
+                    labels = new List<string> { "无库普货推荐" },
+                    website = "小计",
+                    website_show = "小计",
+                    platform_type = search_data.platform_type,
+                    days = new List<bailun_sku_website_sales_dto.bailun_sku_website_sales_date_dto>()
+                });
             }
             
             var b_time = DateTime.Now.AddDays(-1);

AutoTurnOver.Models/Report/bailun_sku_website_sales_dto.cs

@@ -11,6 +11,7 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public bool? has_sum { get; set; }
         public string platform_type { get; set; }
+        public string warehouse_type { get; set; }
     }
 
     public class bailun_sku_website_sales_detailed_search_dto