月销售利润报表增加管理成本杨杉，管理成本信荟蓝

Bailun.DC.Models/dc_month_sale_profit.cs

@@ -181,6 +181,16 @@ namespace Bailun.DC.Models
         public decimal manager_cost_finish_wh { get; set; }
 
         /// <summary>
+        /// 管理成本-杨杉
+        /// </summary>
+        public decimal manager_cost_yangshan { get; set; }
+        
+        /// <summary>
+        /// 管理成本-信荟蓝
+        /// </summary>
+        public decimal manager_cost_xinhuilan { get; set; }
+
+        /// <summary>
         /// 财务费用
         /// </summary>		
         public decimal finance_fee { get; set; }

Bailun.DC.Models/dc_month_sale_profit_description.cs

@@ -159,6 +159,16 @@ namespace Bailun.DC.Models
         public string manager_cost_finish_wh { get; set; }
 
         /// <summary>
+        /// 管理成本-杨杉
+        /// </summary>
+        public string manager_cost_yangshan { get; set; }
+
+        /// <summary>
+        /// 管理成本-信荟蓝
+        /// </summary>
+        public string manager_cost_xinhuilan { get; set; }
+
+        /// <summary>
         /// 财务费用
         /// </summary>		
         public string finance_fee { get; set; }

Bailun.DC.Models/mMonthSaleProfit.cs

@@ -82,6 +82,16 @@ namespace Bailun.DC.Models
         public decimal? manager_cost_finish_wh { get; set; }
 
         /// <summary>
+        /// 管理成本-杨杉
+        /// </summary>
+        public decimal? manager_cost_yangshan { get; set; }
+
+        /// <summary>
+        /// 管理成本-信荟蓝
+        /// </summary>
+        public decimal? manager_cost_xinhuilan { get; set; }
+
+        /// <summary>
         /// 财务费用
         /// </summary>
         public decimal? finance_fee { get; set; }
@@ -255,6 +265,17 @@ namespace Bailun.DC.Models
         /// 管理成本-成品仓（不含直接支付的与销售平台相关的费用）
         /// </summary>		
         public string manager_cost_finish_wh { get; set; }
+        
+        /// <summary>
+        /// 管理成本-杨杉
+        /// </summary>
+        public string manager_cost_yangshan { get; set; }
+
+        /// <summary>
+        /// 管理成本-信荟蓝
+        /// </summary>
+        public string manager_cost_xinhuilan { get; set; }
+
 
         /// <summary>
         /// 财务费用

Bailun.DC.MonthSaleProfit/Services.cs

@@ -90,6 +90,8 @@ namespace Bailun.DC.MonthSaleProfit
                     manager_cost_gzbailun = 0,
                     manager_cost_hkbailun = 0,
                     manager_cost_meijiadian = 0,
+                    manager_cost_yangshan = 0,
+                    manager_cost_xinhuilan = 0,
                     month = day.ToString("yyyy-MM"),
 
                     nonbusiness_income = 0,
@@ -211,8 +213,8 @@ namespace Bailun.DC.MonthSaleProfit
                 //销售相关的管理成本=处理费+直接支付的与销售平台相关费用
                 m.sale_manager_cost = m.handlingcharges + m.payfor_platform_related_fee;
 
-                //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用
-                m.direct_manager_cost = m.manager_cost_hkbailun + m.manager_cost_gzbailun + m.manager_cost_finish_wh + m.finance_fee+m.manager_cost_meijiadian;
+                //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用+管理成本杨杉+管理成本信荟蓝
+                m.direct_manager_cost = m.manager_cost_hkbailun + m.manager_cost_gzbailun + m.manager_cost_finish_wh + m.finance_fee+m.manager_cost_meijiadian+m.manager_cost_yangshan+m.manager_cost_xinhuilan;
 
                 //管理成本合计=直接管理成本+销售相关的管理成本
                 m.manager_cost_count = m.direct_manager_cost + m.sale_manager_cost;
@@ -232,8 +234,8 @@ namespace Bailun.DC.MonthSaleProfit
 
 
                 cn.Execute("delete from dc_month_sale_profit where month='" + m.month + "'");
-                sql = $@"insert dc_month_sale_profit (actual_profit,amount_sale,balance_of_profit,business_profit,business_profit_rate,cost_sale,createtime,direct_manager_cost,finance_fee,handlingcharges,lastupdatetime,lastupdateuserid,lastupdateusername,ls_count,ls_head_cost,ls_oversea_storage,ls_platform_operation_fee,ls_tail_cost,manager_cost_count,manager_cost_finish_wh,manager_cost_gzbailun,manager_cost_hkbailun,manager_cost_meijiadian,month,nonbusiness_income,nonbusiness_pay,other_incoming,participation_in_profit,payfor_platform_related_fee,pt_count,pt_ebay_postingfee,pt_incoming,pt_paypal_fee,pt_platformfee,pt_platform_ad_subscribe_fee,pt_platform_logistics_fee,pt_platform_storage_fee,pt_refund_amount,sale_fee_count,sale_manager_cost,sale_profit,sale_profit_rate) values 
-                        ({m.actual_profit},{m.amount_sale},{m.balance_of_profit},{m.business_profit},{m.business_profit_rate},{m.cost_sale},'{m.createtime.ToString("yyyy-MM-dd HH:mm:ss")}',{m.direct_manager_cost},{m.finance_fee},{m.handlingcharges},'{m.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}',{m.ls_count},{m.ls_head_cost},{m.ls_oversea_storage},{m.ls_platform_operation_fee},{m.ls_tail_cost},{m.manager_cost_count},{m.manager_cost_finish_wh},{m.manager_cost_gzbailun},{m.manager_cost_hkbailun},{m.manager_cost_meijiadian},'{m.month}',{m.nonbusiness_income},{m.nonbusiness_pay},{m.other_incoming},{m.participation_in_profit},{m.payfor_platform_related_fee},{m.pt_count},{m.pt_ebay_postingfee},{m.pt_incoming},{m.pt_paypal_fee},{m.pt_platformfee},{m.pt_platform_ad_subscribe_fee},{m.pt_platform_logistics_fee},{m.pt_platform_storage_fee},{m.pt_refund_amount},{m.sale_fee_count},{m.sale_manager_cost},{m.sale_profit},{m.sale_profit_rate})";
+                sql = $@"insert dc_month_sale_profit (actual_profit,amount_sale,balance_of_profit,business_profit,business_profit_rate,cost_sale,createtime,direct_manager_cost,finance_fee,handlingcharges,lastupdatetime,lastupdateuserid,lastupdateusername,ls_count,ls_head_cost,ls_oversea_storage,ls_platform_operation_fee,ls_tail_cost,manager_cost_count,manager_cost_finish_wh,manager_cost_gzbailun,manager_cost_hkbailun,manager_cost_meijiadian,month,nonbusiness_income,nonbusiness_pay,other_incoming,participation_in_profit,payfor_platform_related_fee,pt_count,pt_ebay_postingfee,pt_incoming,pt_paypal_fee,pt_platformfee,pt_platform_ad_subscribe_fee,pt_platform_logistics_fee,pt_platform_storage_fee,pt_refund_amount,sale_fee_count,sale_manager_cost,sale_profit,sale_profit_rate,manager_cost_yangshan,manager_cost_xinhuilan) values 
+                        ({m.actual_profit},{m.amount_sale},{m.balance_of_profit},{m.business_profit},{m.business_profit_rate},{m.cost_sale},'{m.createtime.ToString("yyyy-MM-dd HH:mm:ss")}',{m.direct_manager_cost},{m.finance_fee},{m.handlingcharges},'{m.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}',{m.ls_count},{m.ls_head_cost},{m.ls_oversea_storage},{m.ls_platform_operation_fee},{m.ls_tail_cost},{m.manager_cost_count},{m.manager_cost_finish_wh},{m.manager_cost_gzbailun},{m.manager_cost_hkbailun},{m.manager_cost_meijiadian},'{m.month}',{m.nonbusiness_income},{m.nonbusiness_pay},{m.other_incoming},{m.participation_in_profit},{m.payfor_platform_related_fee},{m.pt_count},{m.pt_ebay_postingfee},{m.pt_incoming},{m.pt_paypal_fee},{m.pt_platformfee},{m.pt_platform_ad_subscribe_fee},{m.pt_platform_logistics_fee},{m.pt_platform_storage_fee},{m.pt_refund_amount},{m.sale_fee_count},{m.sale_manager_cost},{m.sale_profit},{m.sale_profit_rate},{m.manager_cost_yangshan},{m.manager_cost_xinhuilan})";
 
                 cn.Execute(sql);
             }
@@ -361,7 +363,7 @@ namespace Bailun.DC.MonthSaleProfit
                     m.sale_manager_cost = m.handlingcharges + m.payfor_platform_related_fee;
 
                     //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用+管理成本美甲店
-                    m.direct_manager_cost = m.manager_cost_hkbailun + m.manager_cost_gzbailun + m.manager_cost_finish_wh + m.finance_fee+m.manager_cost_meijiadian;
+                    m.direct_manager_cost = m.manager_cost_hkbailun + m.manager_cost_gzbailun + m.manager_cost_finish_wh + m.finance_fee+m.manager_cost_meijiadian+m.manager_cost_yangshan+m.manager_cost_xinhuilan;
 
                     //管理成本合计=直接管理成本+销售相关的管理成本
                     m.manager_cost_count = m.direct_manager_cost + m.sale_manager_cost;
@@ -378,7 +380,7 @@ namespace Bailun.DC.MonthSaleProfit
                     //利润结余=实际利润-分红
                     m.balance_of_profit = m.actual_profit - m.participation_in_profit;
 
-                    sql = $@"update dc_month_sale_profit set amount_sale="+m.amount_sale+ ",cost_sale="+m.cost_sale+ ",pt_platformfee="+m.pt_platformfee+ ",pt_ebay_postingfee="+m.pt_ebay_postingfee+ ",pt_paypal_fee="+m.pt_paypal_fee+ ",pt_platform_logistics_fee="+m.pt_platform_logistics_fee+ ",pt_platform_ad_subscribe_fee="+m.pt_platform_ad_subscribe_fee+ ",pt_refund_amount="+m.pt_refund_amount+ ",ls_head_cost="+m.ls_head_cost+ ",ls_tail_cost="+m.ls_tail_cost+ ",ls_platform_operation_fee="+m.ls_platform_operation_fee+ ",pt_count="+m.pt_count+ ",pt_incoming="+m.pt_incoming+ ",ls_count="+m.ls_count+ ",sale_fee_count="+m.sale_fee_count+ ",sale_profit="+m.sale_profit+ ",sale_profit_rate="+m.sale_profit_rate+ ",sale_manager_cost="+m.sale_manager_cost+ ",direct_manager_cost="+m.direct_manager_cost+ ",manager_cost_count="+m.manager_cost_count+ ",business_profit="+m.business_profit+ ",business_profit_rate="+m.business_profit_rate+ ",actual_profit="+m.actual_profit+ ",balance_of_profit="+m.balance_of_profit+" where id="+m.id;
+                    sql = $@"update dc_month_sale_profit set amount_sale="+m.amount_sale+ ",cost_sale="+m.cost_sale+ ",pt_platformfee="+m.pt_platformfee+ ",pt_ebay_postingfee="+m.pt_ebay_postingfee+ ",pt_paypal_fee="+m.pt_paypal_fee+ ",pt_platform_logistics_fee="+m.pt_platform_logistics_fee+ ",pt_platform_ad_subscribe_fee="+m.pt_platform_ad_subscribe_fee+ ",pt_refund_amount="+m.pt_refund_amount+ ",ls_head_cost="+m.ls_head_cost+ ",ls_tail_cost="+m.ls_tail_cost+ ",ls_platform_operation_fee="+m.ls_platform_operation_fee+ ",pt_count="+m.pt_count+ ",pt_incoming="+m.pt_incoming+ ",ls_count="+m.ls_count+ ",sale_fee_count="+m.sale_fee_count+ ",sale_profit="+m.sale_profit+ ",sale_profit_rate="+m.sale_profit_rate+ ",sale_manager_cost="+m.sale_manager_cost+ ",direct_manager_cost="+m.direct_manager_cost+ ",manager_cost_count="+m.manager_cost_count+ ",business_profit="+m.business_profit+ ",business_profit_rate="+m.business_profit_rate+ ",actual_profit="+m.actual_profit+ ",balance_of_profit="+m.balance_of_profit+ ",manager_cost_yangshan=" + m.manager_cost_yangshan+",manager_cost_xinhuilan=" + m.manager_cost_xinhuilan+" where id=" + m.id;
                     cn.Execute(sql);
                 }
 

Bailun.DC.Services/FinanceReportServices.cs

@@ -5122,6 +5122,16 @@ group by currency";
                     obj.manager_cost_meijiadian = m.manager_cost_meijiadian.Value;
                 }
 
+                //Add by Allan at 20200923,for 增加管理成本-杨杉、管理成本-信荟蓝
+                if(m.manager_cost_yangshan.HasValue)
+                {
+                    obj.manager_cost_yangshan = m.manager_cost_yangshan.Value;
+                }
+                if(m.manager_cost_xinhuilan.HasValue)
+                {
+                    obj.manager_cost_xinhuilan = m.manager_cost_xinhuilan.Value;
+                }
+
                 if (m.nonbusiness_income.HasValue)
                 {
                     obj.nonbusiness_income = m.nonbusiness_income.Value;
@@ -5187,8 +5197,8 @@ group by currency";
                 //销售相关的管理成本=处理费+直接支付的与销售平台相关费用
                 obj.sale_manager_cost = obj.handlingcharges + obj.payfor_platform_related_fee;
 
-                //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用+管理成本美甲店
-                obj.direct_manager_cost = obj.manager_cost_hkbailun + obj.manager_cost_gzbailun + obj.manager_cost_finish_wh+obj.finance_fee+obj.manager_cost_meijiadian;
+                //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用+管理成本美甲店+管理成本杨杉+管理成本信荟蓝
+                obj.direct_manager_cost = obj.manager_cost_hkbailun + obj.manager_cost_gzbailun + obj.manager_cost_finish_wh+obj.finance_fee+obj.manager_cost_meijiadian+obj.manager_cost_yangshan+obj.manager_cost_xinhuilan;
 
                 //管理成本合计=直接管理成本+销售相关的管理成本
                 obj.manager_cost_count = obj.direct_manager_cost + obj.sale_manager_cost;
@@ -5292,6 +5302,10 @@ group by currency";
                         manager_cost_gzbailun = "",
                         manager_cost_hkbailun = "",
                         manager_cost_meijiadian = "",
+
+                        manager_cost_yangshan = "",
+                        manager_cost_xinhuilan = "",
+
                         sale_manager_cost = "",
                         sale_fee_count = "",
                         sale_profit = "",
@@ -5406,6 +5420,16 @@ group by currency";
                 {
                     obj.manager_cost_meijiadian = m.manager_cost_meijiadian;
                 }
+
+                else if(obj.manager_cost_yangshan!=m.manager_cost_yangshan && m.manager_cost_yangshan!=null)
+                {
+                    obj.manager_cost_yangshan = m.manager_cost_yangshan;
+                }
+
+                else if(obj.manager_cost_xinhuilan!=m.manager_cost_xinhuilan && m.manager_cost_xinhuilan!=null)
+                {
+                    obj.manager_cost_xinhuilan = m.manager_cost_xinhuilan;
+                }
                 
 
                 else if (obj.nonbusiness_income != m.nonbusiness_income && m.nonbusiness_income != null)

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

@@ -7877,6 +7877,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     manager_cost_gzbailun = a.manager_cost_gzbailun.ToString("N2"),
                     manager_cost_meijiadian = a.manager_cost_meijiadian.ToString("N2"),
                     manager_cost_finish_wh = a.manager_cost_finish_wh.ToString("N2"),
+                    manager_cost_yangshan = a.manager_cost_yangshan.ToString("N2"),
+                    manager_cost_xinhuilan = a.manager_cost_xinhuilan.ToString("N2"),
+
                     finance_fee = a.finance_fee.ToString("N2"),
                     manager_cost_count = a.manager_cost_count.ToString("N2"),
                     business_profit = a.business_profit.ToString("N2"),
@@ -7920,6 +7923,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 head.Add(new Tuple<string, string, string, string, string>("manager_cost_hkbailun", "<td>管理成本-香港百伦（不含直接支付的与销售平台相关的费用）</td>", "<span class=\"lbl_manager_cost_hkbailun\">{manager_cost_hkbailun+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_hkbailun_desc}\" /><a class=\"manager_cost_hkbailun\" onclick=\"Edit('manager_cost_hkbailun','管理成本-香港百伦（不含直接支付的与销售平台相关的费用）','{month}','{manager_cost_hkbailun}')\" val=\"\">编辑</a>", "0", "{manager_cost_hkbailun}"));
                 head.Add(new Tuple<string, string, string, string, string>("manager_cost_gzbailun", "<td>管理成本-广州百伦</td>", "<span class=\"lbl_manager_cost_gzbailun\">{manager_cost_gzbailun+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_gzbailun_desc}\" /><a class=\"manager_cost_gzbailun\" onclick=\"Edit('manager_cost_gzbailun','管理成本-广州百伦','{month}','{manager_cost_gzbailun}')\" val=\"\">编辑</a>", "0", "{manager_cost_gzbailun}"));
                 head.Add(new Tuple<string, string, string, string, string>("manager_cost_meijiadian", "<td>管理成本-美甲店</td>", "<span class=\"lbl_manager_cost_meijiadian\">{manager_cost_meijiadian+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_meijiadian_desc}\" /><a class=\"manager_cost_meijiadian\" onclick=\"Edit('manager_cost_meijiadian','管理成本-美甲店','{month}','{manager_cost_meijiadian}')\" val=\"\">编辑</a>", "0", "{manager_cost_meijiadian}"));
+                head.Add(new Tuple<string, string, string, string, string>("manager_cost_yangshan", "<td>管理成本-杨杉</td>", "<span class=\"lbl_manager_cost_yangshan\">{manager_cost_yangshan+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_yangshan_desc}\" /><a class=\"manager_cost_yangshan\" onclick=\"Edit('manager_cost_yangshan','管理成本-杨杉','{month}','{manager_cost_yangshan}')\" val=\"\">编辑</a>", "0", "{manager_cost_yangshan}"));
+                head.Add(new Tuple<string, string, string, string, string>("manager_cost_xinhuilan", "<td>管理成本-信荟蓝</td>", "<span class=\"lbl_manager_cost_xinhuilan\">{manager_cost_xinhuilan+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_xinhuilan_desc}\" /><a class=\"manager_cost_xinhuilan\" onclick=\"Edit('manager_cost_xinhuilan','管理成本-信荟蓝','{month}','{manager_cost_xinhuilan}')\" val=\"\">编辑</a>", "0", "{manager_cost_xinhuilan}"));
+
+
                 head.Add(new Tuple<string, string, string, string, string>("manager_cost_finish_wh", "<td>管理成本-成品仓（不含直接支付的与销售平台相关的费用）</td>", "<span class=\"lbl_manager_cost_finish_wh\">{manager_cost_finish_wh+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_finish_wh_desc}\" /><a class=\"manager_cost_finish_wh\" onclick=\"Edit('manager_cost_finish_wh','管理成本-成品仓（不含直接支付的与销售平台相关的费用）','{month}','{manager_cost_finish_wh}')\" val=\"\">编辑</a>", "0", "{manager_cost_finish_wh}"));
                 head.Add(new Tuple<string, string, string, string, string>("finance_fee", "<td>财务费用</td>", "<span class=\"lbl_finance_fee\">{finance_fee+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{finance_fee_desc}\" /><a class=\"finance_fee\" onclick=\"Edit('finance_fee','财务费用','{month}','{finance_fee}')\" val=\"\">编辑</a>", "0", "{finance_fee}"));
                 head.Add(new Tuple<string, string, string, string, string>("manager_cost_count", "<td style=\"font-weight:bold;text-align:center;\">管理成本合计</td>", "<span class=\"lbl_manager_cost_count\">{manager_cost_count+}</span><img src=\"/img/icon-quetion.png\" style=\"width:18px;margin-left:3px\" title=\"{manager_cost_count_desc}\" />", "{manager_cost_count}", "0"));

Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfit.cshtml

@@ -8,7 +8,7 @@
 <div class="row">
     <div class="col-sm-12">
         <div class="alert alert-warning">
-            说明：数据从9月份开始
+            说明：数据从2019年9月份开始
         </div>
         <div class="ibox-content m-b-sm border-bottom">
             <form id="toolbar">