fix

AutoTurnOver.DB/report.cs

@@ -3072,16 +3072,16 @@ 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 = "普货-精准开发", 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 = "清货", 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 = "美容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>() { } });
@@ -3177,13 +3177,13 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                         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
+                    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_stock_amount_val,
                         ratio = jinzhun_sku_order_stock_amount_val.Division(sum_stock_amount_val)
                     });
-                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "普货-精准开发-出单库存金额占比").weeks.Add(new report_stock_week_view_dto.week
+                    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_stock_amount_val,
@@ -3201,13 +3201,13 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                         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 == "清货-出单库存金额").weeks.Add(new report_stock_week_view_dto.week
+                    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_stock_amount_val,
                         ratio = qinhuo_sku_stock_amount_val.Division(sum_stock_amount_val)
                     });
-                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "清货-出单库存金额占比").weeks.Add(new report_stock_week_view_dto.week
+                    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_stock_amount_val,
@@ -3224,12 +3224,12 @@ where t1.bailun_sku = t2.bailun_sku and t1.week_tag=@week_tag;
                         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
+                    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_stock_amount_val,
                         ratio = meirong_sku_stock_amount_val.Division(sum_stock_amount_val)
-                    }); r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "美容SKU-出单库存金额占比").weeks.Add(new report_stock_week_view_dto.week
+                    }); 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_stock_amount_val,