处理资产负债表，增加子项展示

Bailun.DC.Models/dc_balance_sheet.cs

@@ -26,6 +26,21 @@ namespace Bailun.DC.Models
         public decimal monetary_fund { get; set; }
 
         /// <summary>
+        /// 银行帐号余额
+        /// </summary>
+        public decimal? bank_account_balance { get; set; }
+
+        /// <summary>
+        /// 提现在途金额
+        /// </summary>
+        public decimal? withdraw_amount { get; set; }
+
+        /// <summary>
+        /// 第三方平台余额
+        /// </summary>
+        public decimal? platform_balance { get; set; }
+
+        /// <summary>
         /// 应收账款
         /// </summary>
         public decimal accounts_receivable { get; set; }
@@ -36,6 +51,21 @@ namespace Bailun.DC.Models
         public decimal prepayment { get; set; }
 
         /// <summary>
+        /// 物流供应商预付款项
+        /// </summary>
+        public decimal? logistics_prepayment { get; set; }
+
+        /// <summary>
+        /// 成品供应商预付款项
+        /// </summary>
+        public decimal? finished_prepayment { get; set; }
+
+        /// <summary>
+        /// 半成品供应商预付款项
+        /// </summary>
+        public decimal? semi_prepayment { get; set; }
+
+        /// <summary>
         /// 其他应收款
         /// </summary>
         public decimal other_accounts_receivable { get; set; }
@@ -46,6 +76,36 @@ namespace Bailun.DC.Models
         public decimal inventory_amount { get; set; }
 
         /// <summary>
+        /// FBA库存金额
+        /// </summary>
+        public decimal? fba_inventory_amount { get; set; }
+
+        /// <summary>
+        /// 非FBA库存金额
+        /// </summary>
+        public decimal? not_fba_inventory_amount { get; set; }
+
+        /// <summary>
+        /// FBA在途金额
+        /// </summary>
+        public decimal? fba_transfer_amount { get; set; }
+
+        /// <summary>
+        /// 非FBA在途金额
+        /// </summary>
+        public decimal? not_fba_transfer_amount { get; set; }
+
+        /// <summary>
+        /// 半成品在库金额
+        /// </summary>
+        public decimal? semi_inventory_amount { get; set; }
+
+        /// <summary>
+        /// 半成品在途金额
+        /// </summary>
+        public decimal? semi_transfer_amount { get; set; }
+
+        /// <summary>
         /// 固定资产
         /// </summary>
         public decimal fixed_assets { get; set; }
@@ -61,6 +121,22 @@ namespace Bailun.DC.Models
         public decimal accounts_payable { get; set; }
 
         /// <summary>
+        /// 物流供应商应付账款
+        /// </summary>
+        public decimal? logistics_accounts_payable { get; set; }
+
+        /// <summary>
+        /// 成品供应商应付账款
+        /// </summary>
+        public decimal? finished_accounts_payable { get; set; }
+
+        /// <summary>
+        /// 半成品供应商应付账款
+        /// </summary>
+        public decimal? semi_accounts_payable { get; set; }
+
+
+        /// <summary>
         /// 预收款项
         /// </summary>
         public decimal advance_received { get; set; }

Bailun.DC.Services/FinanceReportServices.cs

@@ -142,6 +142,25 @@ namespace Bailun.DC.Services
                             statistical_time = DateTime.Parse(item),
                             taxes_payable = 0,
                             update_time = DateTime.Now,
+
+                            bank_account_balance = 0,
+                            withdraw_amount = 0,
+                            platform_balance = 0,
+                            logistics_prepayment = 0,
+                            finished_prepayment = 0,
+                            semi_prepayment = 0,
+
+                            fba_inventory_amount = 0,
+                            not_fba_inventory_amount = 0,
+                            fba_transfer_amount = 0,
+                            not_fba_transfer_amount = 0,
+                            semi_inventory_amount = 0,
+                            semi_transfer_amount = 0,
+
+                            logistics_accounts_payable=0,
+                            finished_accounts_payable=0,
+                            semi_accounts_payable=0,
+
                         };
 
                         list.Add(m);

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

@@ -98,6 +98,24 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 m.oe_surplus_public_accumulation = m.oe_surplus_public_accumulation ?? 0;
                 m.oe_undistributed_profit = m.oe_undistributed_profit ?? 0;
 
+                m.bank_account_balance = m.bank_account_balance ?? 0;
+                m.withdraw_amount = m.withdraw_amount ?? 0;
+                m.platform_balance = m.platform_balance ?? 0;
+                m.logistics_prepayment = m.logistics_prepayment ?? 0;
+                m.finished_prepayment = m.finished_prepayment ?? 0;
+                m.semi_prepayment = m.semi_prepayment ?? 0;
+
+                m.fba_inventory_amount = m.fba_inventory_amount ?? 0;
+                m.not_fba_inventory_amount = m.not_fba_inventory_amount ?? 0;
+                m.fba_transfer_amount = m.fba_transfer_amount ?? 0;
+                m.not_fba_transfer_amount = m.not_fba_transfer_amount ?? 0;
+                m.semi_inventory_amount = m.semi_inventory_amount ?? 0;
+                m.semi_transfer_amount = m.semi_transfer_amount ?? 0;
+
+                m.logistics_accounts_payable = m.logistics_accounts_payable ?? 0;
+                m.finished_accounts_payable = m.finished_accounts_payable ?? 0;
+                m.semi_accounts_payable = m.semi_accounts_payable ?? 0;
+
 
                 //Add by Allan at 2019-01-30 16:04
                 m.prepayment = Math.Abs(m.prepayment);

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

@@ -49,7 +49,7 @@
                 { field: 'day', title: '日期', width: '90', sortable: true }
             ];
 
-            var url = '@Url.Content("~/Reports/Finance/PrePayLogisticsJson")' + '?date=@(ViewBag.date)&paycompanyid=@(ViewBag.paycompanyid)';
+            var url = '@Url.Content("~/Reports/Finance/CopeWithLogisticsJson")' + '?date=@(ViewBag.date)&paycompanyid=@(ViewBag.paycompanyid)';
 
             if (tb == undefined) {
                 tb = OnlyTable("roletable", columns, url, "");

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

@@ -50,7 +50,7 @@
 
         function list() {
             var columns = [
-                { field: 'company_name', title: '付款主体', width: '160', sortable: false },
+                //{ field: 'company_name', title: '付款主体', width: '160', sortable: false },
                 { field: 'warehouse_name', title: '仓库名称', width: '140', sortable: true},
                 { field: 'balance_rmb', title: '存货余额', width: '110', sortable: true },
                 { field: 'statistical_time', title: '日期', width: '110', sortable: false }