增加 减：资产减值损失 字段

Bailun.DC.Models/dc_month_sales_profit.cs

@@ -257,5 +257,10 @@ namespace Bailun.DC.Models
         /// 是否编辑的版本，1：是，0：否
         /// </summary>
         public int isedit { get; set; }
+
+        /// <summary>
+        /// 减：资产减值损失
+        /// </summary>
+        public decimal? impairment_assets { get; set; }
     }
 }

Bailun.DC.Models/mMonthSaleProfitNew_Input.cs

@@ -228,5 +228,10 @@ namespace Bailun.DC.Models
         /// </summary>
         public decimal? rate_profit_actual { get; set; }
 
+        /// <summary>
+        /// 减：资产减值损失
+        /// </summary>
+        public decimal? impairment_assets { get; set; }
+
     }
 }

Bailun.DC.Services/FinanceReportServices.cs

@@ -5325,6 +5325,8 @@ group by currency";
                         amount_sales_other = 0,
                         cost_other = 0,
                         managercost_xinhuilan = 0,
+
+                        impairment_assets = 0,
                     };
                 }
 
@@ -5516,6 +5518,11 @@ group by currency";
                     obj.pay_non_operating = m.pay_non_operating.Value;
                 }
 
+                if(m.impairment_assets.HasValue)
+                {
+                    obj.impairment_assets = m.impairment_assets;
+                }
+
 
                 //销售额=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他
                 obj.amount_sales = obj.amount_sales_dianzi + obj.amount_sales_fuzhuang + obj.amount_sales_jiaju + obj.amount_sales_jingyou + obj.amount_sales_meirongmj+obj.amount_sales_other;
@@ -5558,8 +5565,8 @@ group by currency";
                 obj.rate_profit = obj.amount_sales > 0 ? obj.profit / obj.amount_sales : 0;
                 sql_update += " ,rate_profit=" + obj.rate_profit;
 
-                //实际利润=营业利润+其他收入+营业外收入-营业外支出
-                obj.actual_profit = obj.profit + obj.incoming_other + obj.incoming_non_operating - obj.pay_non_operating;
+                //实际利润=营业利润+其他收入+营业外收入-营业外支出-资产减值
+                obj.actual_profit = obj.profit + obj.incoming_other + obj.incoming_non_operating - obj.pay_non_operating-(obj.impairment_assets??0);
                 sql_update += " ,actual_profit=" + obj.actual_profit;
 
                 //利润结余=实际利润-分红

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

@@ -8635,6 +8635,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     actual_profit = a.actual_profit.ToString("N2"), 
                     dividend = a.dividend.ToString("N2"),
 
+                    impairment_assets = (a.impairment_assets??0).ToString("N2"),
+
                     a.month
                 });
 
@@ -8696,7 +8698,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listHead.Add(new Tuple<string, string, int>("其中：出口退税收入", "incoming_refundtax", 0));
                 listHead.Add(new Tuple<string, string, int>("加：营业外收入", "incoming_non_operating", 0));
                 listHead.Add(new Tuple<string, string, int>("减：营业外支出", "pay_non_operating", 0));
-                listHead.Add(new Tuple<string, string, int>("实际利润", "actual_profit", 0));
+                listHead.Add(new Tuple<string, string, int>("减：资产减值损失", "impairment_assets", 0));
+                listHead.Add(new Tuple<string, string, int>("实际利润", "actual_profit", 1));
                 //listHead.Add(new Tuple<string, string, int>("减：分红", "dividend", 0));
                 //listHead.Add(new Tuple<string, string, int>("利润结余", "profit_balance", 0));
                 listHead.Add(new Tuple<string, string, int>("净利率", "rate_profit_actual", 1));
@@ -8758,6 +8761,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     m.pay_non_operating = item.Sum(a => a.pay_non_operating);
 
+                    m.impairment_assets = item.Sum(a => (a.impairment_assets??0));
+
                     //销售额=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他-平台退款
                     m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj + m.amount_sales_other-m.fee_refund;
 
@@ -8788,8 +8793,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     //营业毛利率=营业利润/销售额
                     m.rate_profit = m.amount_sales > 0 ? m.profit / m.amount_sales : 0;
 
-                    //实际利润=营业利润+其他收入+营业外收入-营业外支出
-                    m.actual_profit = m.profit + m.incoming_other + m.incoming_non_operating - m.pay_non_operating;
+                    //实际利润=营业利润+其他收入+营业外收入-营业外支出-资产减值
+                    m.actual_profit = m.profit + m.incoming_other + m.incoming_non_operating - m.pay_non_operating-(m.impairment_assets??0);
 
                     //利润结余=实际利润
                     m.profit_balance = m.actual_profit;
@@ -8861,6 +8866,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     actual_profit = a.actual_profit.ToString("N2"),
                     dividend = a.dividend.ToString("N2"),
 
+                    impairment_assets = (a.impairment_assets??0).ToString("N2"),
+
                     a.month
                 });
 

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

@@ -93,7 +93,7 @@
 
                             for (var i in result.head) {
                                 var col = result.head[i];
-                                var row = col.item3 == 0 ? '<tr><td>' + col.item1 + '</td>':'<tr><td style="font-weight:bold;">' + col.item1 + '</td>';
+                                var row = col.item3 == 0 ? '<tr style="' + (col.item3 == 1 ? 'background:#F5F5F6;' : '') + '"><td>' + col.item1 + '</td>' : '<tr style="' + (col.item3 == 1 ? 'background:#F5F5F6;' : '') + '"><td style="font-weight:bold;">' + col.item1 + '</td>';
 
                                 for (var d in result.data) {
                                     var objData = result.data[d];