调整月销售利润报表的统计规则

Bailun.DC.MonthSaleProfit/Services.cs

@@ -537,7 +537,7 @@ namespace Bailun.DC.MonthSaleProfit
                 var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?" + "BeginRepayTime=" + day.ToString("yyyy-MM-dd") + "&EndRepayTime=" + day.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
                 var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl);
                 //管理成本
-                var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceFee(day, day.AddMonths(1).AddDays(-1), "", "", "", null,1);
+                var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceFee(day, day.AddMonths(1).AddDays(-1), "", "", "", null,null);
                 //手续费
                 var listHandleFee = new Bailun.DC.Services.FinanceReportServices().ListFinanceHandleFee(day, day.AddMonths(1).AddDays(-1), 1);
 
@@ -637,7 +637,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
 
                 //付现销售费用
-                m.managecost_bl_xg = (list.Where(a => a.company_name.Contains("香港百伦") && a.type_name == "付现销售费用")?.Sum(a => (a.cost_form==2?-a.amount_rmb:a.amount_rmb)) ?? 0);
+                m.managecost_bl_xg = (list.Where(a => a.company_name.Contains("香港百伦") && a.type_name != "物流费" && a.type_name!= "销售费用/物流费")?.Sum(a => a.amount_rmb) ?? 0);
                 m.fee_paycash_sales = 0; //list.Where(a => (a.fee_super_type == "推广费") && !a.company_name.Contains("香港百伦") && !a.company_name.Contains("四千里") && !a.company_name.Contains("YOUNGTOP INTERNATIONAL LIMITED") && !a.company_name.Contains("miles") && !a.company_name.Contains("拉古娜") && !a.company_name.Contains("哈倪蔓"))?.Sum(a => a.amount_rmb) ?? 0;
                 //付现销售费用加上香港百伦的管理成本金额 
                 //Add by Allan at 20210102
@@ -655,7 +655,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
 
                 //管理成本=广州百伦+美容美甲店+杨杉+信荟蓝+成品仓+迪致美容
                 
-                m.managecost_bl_gz = (list.Where(a => a.company_name.Contains("广州百伦") && (a.type_name != "出口退税款"))?.Sum(a => a.amount_rmb) ?? 0)+(listHandleFee?.Sum(a=>a.pay_money_rMB)??0);
+                m.managecost_bl_gz = (list.Where(a => a.company_name==("广州百伦供应链科技有限公司") && (a.type_name != "出口退税款"))?.Sum(a => a.amount_rmb) ?? 0);
                 m.managecost_meijia = (list.Where(a => a.company_name.Contains("歌戈儿") && (a.type_name != "销售收入" && a.type_name != "出口退税款"))?.Sum(a => a.amount_rmb) ?? 0);
                 m.managercost_chengpincang = (list.Where(a => (a.company_name.Contains("广州电子服装仓") || a.company_name.Contains("阳山")) && (a.type_name != "出口退税款"))?.Sum(a => a.amount_rmb) ?? 0);
                 m.managercost_yangshan = (list.Where(a => a.company_name.Contains("扬杉") && (a.type_name != "出口退税款"))?.Sum(a => a.amount_rmb) ?? 0);
@@ -666,7 +666,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
                 m.managercost_count = m.managecost_bl_gz + m.managecost_meijia + m.managercost_chengpincang + m.managercost_xinhuilan + m.managercost_yangshan+m.managercost_dizhi;
 
                 //财务费用=利息费用
-                m.fee_finance = (listInterest?.Sum(a => a.RepayInterestRMB) ?? 0);
+                m.fee_finance = (listInterest?.Sum(a => a.RepayInterestRMB) ?? 0)+(listHandleFee?.Sum(a => a.pay_money_rMB) ?? 0);
 
                 //营业利润=销售利润-管理成本合计-财务费用
                 m.profit = m.profit_sales - m.managercost_count - m.fee_finance;

Bailun.DC.Services/FinanceReportServices.cs

@@ -6884,12 +6884,12 @@ group by currency";
         /// <returns></returns>
         public List<dc_base_finance_fee> ListMonthProfitFeeOrderDetail(BtTableParameter parameter,DateTime start,DateTime end,string col,ref int total)
         {
-            var sql = $"select * from dc_base_finance_fee where cost_status=4 and (is_lend is null or is_lend=1 or (is_lend=2 and lend_balance>0) or (is_lend=2 and cost_form=1)) and pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and is_manage_cost=1";
+            var sql = $"select * from dc_base_finance_fee where cost_status=4 and (is_lend is null or is_lend=1 or (is_lend=2 and lend_balance>0) or (is_lend=2 and cost_form=1)) and pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
 
 
             if (col.Trim() == "fee_paycash_sales")  //付现 fee_paycash_sales
             {
-                sql += @" and (company_name='香港百伦科技有限公司' and type_name = '付现销售费用') ";
+                sql += @" and (company_name='香港百伦科技有限公司' and type_name != '物流费' && type_name!= '销售费用/物流费') ";
             }
 
             else if (col.Trim() == "managecost_bl_gz")  //广州百伦