1

Bailun.DC.Models/mMonthSaleProfitNew_Input.cs

@@ -154,6 +154,18 @@ namespace Bailun.DC.Models
         /// 管理成本-信荟蓝
         /// </summary>
         public decimal? managercost_xinhuilan { get; set; }
+
+        /// <summary>
+        /// 迪致美容
+        /// </summary>
+        public decimal? managercost_dizhi { get; set; }
+
+        /// <summary>
+        /// 广州美甲生产仓
+        /// </summary>
+        public decimal? managercost_meijiashengchan { get; set; }
+
+
         /// <summary>
         /// 管理成本合计
         /// </summary>

Bailun.DC.Services/FinanceReportServices.cs

@@ -5299,6 +5299,8 @@ group by currency";
                         managecost_bl_xg = 0,
                         managecost_meijia = 0,
                         managercost_yangshan = 0,
+                        managercost_dizhi = 0,
+                        managercost_meijiashengchan = 0,
 
                         dividend = 0,
                         incoming_non_operating = 0,
@@ -5499,6 +5501,16 @@ group by currency";
                     obj.managercost_yangshan = m.managercost_yangshan.Value;
                 }
 
+                if(m.managercost_dizhi.HasValue)
+                {
+                    obj.managercost_dizhi = m.managercost_dizhi.Value;
+                }
+
+                if(m.managercost_meijiashengchan.HasValue)
+                {
+                    obj.managercost_meijiashengchan = m.managercost_meijiashengchan.Value;
+                }
+
                 if(m.pay_non_operating.HasValue)
                 {
                     obj.pay_non_operating = m.pay_non_operating.Value;
@@ -5535,8 +5547,8 @@ group by currency";
                 //销售毛利率=销售利润/销售额
                 obj.rate_profit_sales = obj.amount_sales > 0 ? obj.profit_sales / obj.amount_sales : 0;
 
-                //管理成本=香港百伦+广州百伦+美容美甲店+杨杉+信荟蓝+成品仓
-                obj.managercost_count = obj.managecost_bl_gz + obj.managecost_bl_xg + obj.managecost_meijia + obj.managercost_chengpincang + obj.managercost_xinhuilan + obj.managercost_yangshan;
+                //管理成本=香港百伦+广州百伦+美容美甲店+杨杉+信荟蓝+成品仓+迪致+广州美甲生产仓
+                obj.managercost_count = obj.managecost_bl_gz + obj.managecost_bl_xg + obj.managecost_meijia + obj.managercost_chengpincang + obj.managercost_xinhuilan + obj.managercost_yangshan+obj.managercost_dizhi+obj.managercost_meijiashengchan;
 
                 //营业利润=销售利润-管理成本合计-财务费用
                 obj.profit = obj.profit_sales - obj.managercost_count - obj.fee_finance;

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -8460,6 +8460,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     m.managercost_count = item.Sum(a => a.managercost_count);
                     m.managercost_xinhuilan = item.Sum(a => a.managercost_xinhuilan);
                     m.managercost_yangshan = item.Sum(a => a.managercost_yangshan);
+                    m.managercost_dizhi = item.Sum(a => a.managercost_dizhi);
+                    m.managercost_meijiashengchan = item.Sum(a => a.managercost_meijiashengchan);
                     m.month = item.Key;
 
                     m.pay_non_operating = item.Sum(a => a.pay_non_operating);
@@ -8550,6 +8552,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     managercost_count = a.managercost_count.ToString("N2"),
                     managercost_xinhuilan = a.managercost_xinhuilan.ToString("N2"),
                     managercost_yangshan = a.managercost_yangshan.ToString("N2"),
+                    managercost_dizhi = a.managercost_dizhi.ToString("N2"),
+                    managercost_meijiashengchan = a.managercost_meijiashengchan.ToString("N2"),
 
                     pay_non_operating = a.pay_non_operating.ToString("N2"),
                     profit = a.profit.ToString("N2"),