1、增加4k每月销售利润报表

2、新资产负债表的调整后数据改为基础+编辑的

Bailun.DC.Models/dc_month_sales_profit_4k.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class dc_month_sales_profit_4k
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string month { get; set; }
+
+
+        /// <summary>
+        /// 营业收入
+        /// </summary>
+        public decimal incoming_operating { get; set; }
+
+
+        /// <summary>
+        /// SAAS套餐收入
+        /// </summary>
+        public decimal incoming_operating_saas { get; set; }
+
+
+        /// <summary>
+        /// 测评收入
+        /// </summary>
+        public decimal incoming_operating_test { get; set; }
+
+
+        /// <summary>
+        /// DSP服务收入
+        /// </summary>
+        public decimal incoming_operating_dsp { get; set; }
+
+
+        /// <summary>
+        /// MH代理收入
+        /// </summary>
+        public decimal incoming_operating_mh { get; set; }
+
+
+        /// <summary>
+        /// 代运营收入
+        /// </summary>
+        public decimal incoming_operating_tp { get; set; }
+
+
+        /// <summary>
+        /// 粉丝系统服务收入
+        /// </summary>
+        public decimal incoming_operating_fansservice { get; set; }
+
+
+        /// <summary>
+        /// 其他收入
+        /// </summary>
+        public decimal incoming_operating_other { get; set; }
+
+
+        /// <summary>
+        /// 减：营业成本
+        /// </summary>
+        public decimal cost_operating { get; set; }
+
+
+        /// <summary>
+        /// IT人工成本
+        /// </summary>
+        public decimal cost_operating_it { get; set; }
+
+
+        /// <summary>
+        /// DSP渠道成本
+        /// </summary>
+        public decimal cost_operating_dspchannel { get; set; }
+
+
+        /// <summary>
+        /// DSP签约成本
+        /// </summary>
+        public decimal cost_operating_dspsign { get; set; }
+
+
+        /// <summary>
+        /// 代运营成本
+        /// </summary>
+        public decimal cost_operating_tp { get; set; }
+
+
+        /// <summary>
+        /// MH客户成本
+        /// </summary>
+        public decimal cost_operating_mh { get; set; }
+
+
+        /// <summary>
+        /// 营业税金及附加
+        /// </summary>
+        public decimal cost_operating_taxes { get; set; }
+
+
+        /// <summary>
+        /// 销售费用
+        /// </summary>
+        public decimal cost_operating_sales { get; set; }
+
+
+        /// <summary>
+        /// 管理费用
+        /// </summary>
+        public decimal cost_operating_manager { get; set; }
+
+
+        /// <summary>
+        /// 财务费用
+        /// </summary>
+        public decimal cost_operating_finance { get; set; }
+
+
+        /// <summary>
+        /// 其中：汇兑损益
+        /// </summary>
+        public decimal cost_operating_exchange { get; set; }
+
+
+        /// <summary>
+        /// 资产减值损失
+        /// </summary>
+        public decimal cost_operating_assets_impairment { get; set; }
+
+
+        /// <summary>
+        ///  加：公允价值变动收益（损失以“-”号填列）
+        /// </summary>
+        public decimal cost_operating_fair_value_change { get; set; }
+
+
+        /// <summary>
+        /// 投资收益（损失以“-”号填列）
+        /// </summary>
+        public decimal cost_operating_investment { get; set; }
+
+
+        /// <summary>
+        /// 其中:对联营企业和合营企业的投资收益
+        /// </summary>
+        public decimal cost_operating_investment_in { get; set; }
+
+
+        /// <summary>
+        /// 营业利润（亏损以“-”号填列） 
+        /// </summary>
+        public decimal profit_operating { get; set; }
+
+
+        /// <summary>
+        /// 加：营业外收入
+        /// </summary>
+        public decimal incoming_out_operating { get; set; }
+
+
+        /// <summary>
+        /// 减：营业外支出
+        /// </summary>
+        public decimal cost_out_operating { get; set; }
+
+
+        /// <summary>
+        /// 其中：非流动资产处置损失
+        /// </summary>
+        public decimal loss_ondisposal_noncurrent_assets { get; set; }
+
+
+        /// <summary>
+        /// 利润总额（亏损总额以“-”号填列）
+        /// </summary>
+        public decimal profit { get; set; }
+
+
+        /// <summary>
+        ///  减：所得税费用
+        /// </summary>
+        public decimal fee_income_tax { get; set; }
+
+
+        /// <summary>
+        /// 净利润
+        /// </summary>
+        public decimal profit_retained { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime createtime { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime lastupdatetime { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int lastupdateuserid { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string lastupdateusername { get; set; }
+
+    }
+}

Bailun.DC.MonthSaleProfit/Services.cs

@@ -42,12 +42,12 @@ namespace Bailun.DC.MonthSaleProfit
 
                     Console.WriteLine("任务运行完成 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                 }
-                else if(now.Day==16 && now.Hour==0 && now.Minute==2)
-                {
-                    Console.WriteLine("重跑上个月的数据 启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                    InitNew(DateTime.Parse(now.ToString("yyyy-MM")+"-01").AddMonths(-1));
-                    Console.WriteLine("结束 重跑上个月的数据 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                }
+                //else if(now.Day==16 && now.Hour==0 && now.Minute==2)
+                //{
+                //    Console.WriteLine("重跑上个月的数据 启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                //    InitNew(DateTime.Parse(now.ToString("yyyy-MM")+"-01").AddMonths(-1));
+                //    Console.WriteLine("结束 重跑上个月的数据 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                //}
                 //else if (now.Hour%6==0 && now.Minute == 59)
                 //{
                 //    Console.WriteLine("开始启动更新服务" + DateTime.Now);
@@ -685,6 +685,59 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
             }
         }
         
+        public void InitNew4K(DateTime day)
+        {
+            var m = new dc_month_sales_profit_4k
+            {
+                cost_operating_assets_impairment = 0,
+                loss_ondisposal_noncurrent_assets = 0,
+
+                cost_operating = 0,
+                cost_operating_dspchannel = 0,
+                cost_operating_dspsign = 0,
+                cost_operating_exchange = 0,
+                cost_operating_fair_value_change = 0,
+                cost_operating_finance = 0,
+                cost_operating_investment = 0,
+                cost_operating_investment_in = 0,
+                cost_operating_it = 0,
+                cost_operating_manager = 0,
+                cost_operating_mh = 0,
+                cost_operating_sales = 0,
+                cost_operating_taxes = 0,
+                cost_operating_tp = 0,
+                cost_out_operating = 0,
+
+                createtime = DateTime.Now,
+                fee_income_tax = 0,
+
+                incoming_operating_mh = 0,
+                incoming_operating = 0,
+                incoming_operating_dsp = 0,
+                incoming_operating_fansservice = 0,
+                incoming_operating_other = 0,
+                incoming_operating_saas = 0,
+                incoming_operating_test = 0,
+                incoming_operating_tp = 0,
+                incoming_out_operating = 0,
+
+                lastupdatetime = DateTime.Now,
+                lastupdateuserid = 0,
+                lastupdateusername = "admin",
+
+                profit = 0,
+                profit_operating = 0,
+                profit_retained = 0,
+
+                month = day.ToString("yyyy-MM"),
+
+            };
+
+
+
+
+        }
+
         /// <summary>
         /// 获取提现到账金额
         /// </summary>

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

@@ -668,15 +668,73 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             listHead.Add(new Tuple<string, string, int>("所有者权益（或股东权益）合并", "oe_count", 1));
             listHead.Add(new Tuple<string, string, int>("负债及股东权益合计", "count_liabilities_and_oe", 1));
 
+            var listCount = new List<dc_balance_sheet_new_result>();
+            foreach(var item in listBase)
+            {
+                var objEdit = listEdit.Where(a => a.statistical_time == item.statistical_time && a.company_value == item.company_value).FirstOrDefault();
+                if(objEdit==null)
+                {
+                    listCount.Add(item);
+                }
+                else
+                {
+                    var m = new dc_balance_sheet_new_result {
+                        monetary_fund = item.monetary_fund+objEdit.monetary_fund,
+                        accounts_receivable = item.accounts_receivable + objEdit.accounts_receivable,
+                        prepayment = item.prepayment + objEdit.prepayment,
+                        other_accounts_receivable = item.other_accounts_receivable + objEdit.other_accounts_receivable,
+                        inventory_amount = item.inventory_amount + objEdit.inventory_amount,
+                        fa_other_assets = item.fa_other_assets + objEdit.fa_other_assets,
+                        fa_count = item.fa_count + objEdit.fa_count,
+
+                        nca_longterm_equity_investment = item.nca_longterm_equity_investment + objEdit.nca_longterm_equity_investment,
+                        fixed_assets= item.fixed_assets + objEdit.fixed_assets,
+                        nca_intangible_assets = item.nca_intangible_assets + objEdit.nca_intangible_assets,
+                        nca_longterm_unamortized_expenses = item.nca_longterm_unamortized_expenses + objEdit.nca_longterm_unamortized_expenses,
+                        nca_count = item.nca_count + objEdit.nca_count,
+
+                        count_assets = item.count_assets + objEdit.count_assets,
+
+                        short_term_borrow = item.short_term_borrow + objEdit.short_term_borrow,
+                        accounts_payable = item.accounts_payable + objEdit.accounts_payable,
+                        advance_received = item.advance_received + objEdit.advance_received,
+                        payable_remuneration = item.payable_remuneration + objEdit.payable_remuneration,
+                        taxes_payable = item.taxes_payable + objEdit.taxes_payable,
+                        fa_interest_receivable = item.fa_interest_receivable + objEdit.fa_interest_receivable,
+                        fa_dividends_receivable = item.fa_dividends_receivable + objEdit.fa_dividends_receivable,
+                        other_accounts_payable = item.other_accounts_payable + objEdit.other_accounts_payable,
+                        cl_oneyear_noncurrent_liabilities = item.cl_oneyear_noncurrent_liabilities + objEdit.cl_oneyear_noncurrent_liabilities,
+                        cl_other_liabilities = item.cl_other_liabilities + objEdit.cl_other_liabilities,
+                        cl_count = item.cl_count + objEdit.cl_count,
+
+                        ncl_longterm_loan = item.ncl_longterm_loan + objEdit.ncl_longterm_loan,
+                        ncl_anticipation_liabilities = item.ncl_anticipation_liabilities + objEdit.ncl_anticipation_liabilities,
+                        ncl_deferred_income_tax_liabilities = item.ncl_deferred_income_tax_liabilities + objEdit.ncl_deferred_income_tax_liabilities,
+                        ncl_other_liabilities = item.ncl_other_liabilities + objEdit.ncl_other_liabilities,
+                        ncl_count = item.ncl_count + objEdit.ncl_count,
+                        count_liabilities = item.count_liabilities + objEdit.count_liabilities,
+
+                        oe_paicl_up_capital = item.oe_paicl_up_capital + objEdit.oe_paicl_up_capital,
+                        oe_capital_reserve = item.oe_capital_reserve + objEdit.oe_capital_reserve,
+                        oe_surplus_public_accumulation = item.oe_surplus_public_accumulation + objEdit.oe_surplus_public_accumulation,
+                        oe_undistributed_profit = item.oe_undistributed_profit + objEdit.oe_undistributed_profit,
+                        oe_count = item.oe_count + objEdit.oe_count,
+                        count_liabilities_and_oe = item.count_liabilities_and_oe + objEdit.count_liabilities_and_oe,
+
+                    };
 
+                    listCount.Add(m);
+                    
+                }
+            }
 
             return Json(new
             {
                 success = list.Count > 0,
-                msg = list.Count == 0 ? "暂无数据" : "",
+                msg = listBase.Count == 0 ? "暂无数据" : "",
                 data = listBase,
                 listEdit = listEdit,
-                listCount = list,
+                listCount = listCount ,//list,
                 head = listHead,
                 isexport = Services.UserAuthorityServices.checkUserExportAuthority("ExportIndex", HttpContextHelper.Current.User.GetUserName()),
             });