调整取数来源

Bailun.DC.MonthSaleProfit/Services.cs

@@ -641,7 +641,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
                 //付现销售费用
                 m.managecost_bl_xg = (list.Where(a => a.company_name.Contains("香港百伦"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.fee_paycash_sales = list.Where(a => (a.fee_super_type == "推广费" || a.fee_super_type == "物流费用") && !a.company_name.Contains("香港百伦"))?.Sum(a => a.amount_rmb) ?? 0;
+                m.fee_paycash_sales = list.Where(a => (a.fee_super_type == "推广费" || a.fee_super_type == "物流费用") && !a.company_name.Contains("香港百伦") && !a.company_name.Contains("四千里") && !a.company_name.Contains("拉古娜") && !a.company_name.Contains("哈倪蔓"))?.Sum(a => a.amount_rmb) ?? 0;
                 //付现销售费用加上香港百伦的管理成本金额 
                 //Add by Allan at 20210102
                 m.fee_paycash_sales += m.managecost_bl_xg;
@@ -658,13 +658,13 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
                 //管理成本=广州百伦+美容美甲店+杨杉+信荟蓝+成品仓+迪致美容
                 
-                m.managecost_bl_gz = (list.Where(a => a.company_name.Contains("广州百伦"))?.Sum(a => a.amount_rmb) ?? 0)+(listHandleFee?.Sum(a=>a.pay_money_rMB)??0);
-                m.managecost_meijia = (list.Where(a => a.company_name.Contains("歌戈儿"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_chengpincang = (list.Where(a => a.company_name.Contains("广州电子服装仓") || a.company_name.Contains("阳山"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_yangshan = (list.Where(a => a.company_name.Contains("扬杉"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_xinhuilan = (list.Where(a => a.company_name.Contains("信荟蓝"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_meijiashengchan = (list.Where(a => a.company_name.Contains("美甲生产仓"))?.Sum(a => a.amount_rmb) ?? 0);
-                m.managercost_dizhi = (list.Where(a => a.company_name.Contains("迪致美容"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managecost_bl_gz = (list.Where(a => a.company_name.Contains("广州百伦") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0)+(listHandleFee?.Sum(a=>a.pay_money_rMB)??0);
+                m.managecost_meijia = (list.Where(a => a.company_name.Contains("歌戈儿") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_chengpincang = (list.Where(a => (a.company_name.Contains("广州电子服装仓") || a.company_name.Contains("阳山")) && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_yangshan = (list.Where(a => a.company_name.Contains("扬杉") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_xinhuilan = (list.Where(a => a.company_name.Contains("信荟蓝") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_meijiashengchan = (list.Where(a => a.company_name.Contains("美甲生产仓") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
+                m.managercost_dizhi = (list.Where(a => a.company_name.Contains("迪致美容") && (a.fee_super_type != "推广费" && a.fee_super_type != "物流费用"))?.Sum(a => a.amount_rmb) ?? 0);
 
                 m.managercost_count = m.managecost_bl_gz + m.managecost_meijia + m.managercost_chengpincang + m.managercost_xinhuilan + m.managercost_yangshan+m.managercost_dizhi;