资产负债表增加fba在途不包含调拨计划，非fba在途不包含调拨计划的明细

Bailun.DC.Models/dc_balance_sheet.cs

@@ -137,13 +137,31 @@ namespace Bailun.DC.Models
         /// </summary>
         [Description("4.存货非FBA仓在途")]
         public decimal? not_fba_transfer_amount { get; set; }
-
+        
         /// <summary>
         /// 半成品在库金额
         /// </summary>
         [Description("5.存货半成品在库")]
         public decimal? semi_inventory_amount { get; set; }
 
+        [Description("6.FBA在途(不包调拨计划)")]
+        public decimal? fba_transfer_allot_amount { get; set; }
+
+        [Description("7.非FBA在途金额(不包调拨计划)")]
+        public decimal? not_fba_transfer_allot_amount { get; set; }
+
+        [Description("8.FBA在途金额(调拨计划)")]
+        public decimal? fba_transfer_plan_amount { get; set; }
+
+        [Description("9.非FBA在途金额(调拨计划)")]
+        public decimal? not_fba_transfer_plan_amount { get; set; }
+
+        [Description("10.FBA在途金额(采购)")]
+        public decimal? fba_purchase_amount { get; set; }
+
+        [Description("11.非FBA在途金额(采购)")]
+        public decimal? not_fba_purchase_amount { get; set; }
+
         /// <summary>
         /// 半成品在途金额
         /// </summary>

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

@@ -117,6 +117,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 m.semi_inventory_amount = m.semi_inventory_amount ?? 0;
                 m.semi_transfer_amount = m.semi_transfer_amount ?? 0;
 
+
+                m.fba_transfer_allot_amount = m.fba_transfer_allot_amount ?? 0;
+                m.not_fba_transfer_allot_amount = m.not_fba_transfer_allot_amount ?? 0;
+                m.fba_transfer_plan_amount = m.fba_transfer_plan_amount ?? 0;
+                m.not_fba_transfer_plan_amount = m.not_fba_transfer_plan_amount ?? 0;
+                m.fba_purchase_amount = m.fba_purchase_amount ?? 0;
+                m.not_fba_purchase_amount = m.not_fba_purchase_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;
@@ -233,6 +242,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 m.semi_inventory_amount = m.semi_inventory_amount ?? 0;
                 m.semi_transfer_amount = m.semi_transfer_amount ?? 0;
 
+                m.fba_transfer_allot_amount = m.fba_transfer_allot_amount ?? 0;
+                m.not_fba_transfer_allot_amount = m.not_fba_transfer_allot_amount ?? 0;
+                m.fba_transfer_plan_amount = m.fba_transfer_plan_amount ?? 0;
+                m.not_fba_transfer_plan_amount = m.not_fba_transfer_plan_amount ?? 0;
+                m.fba_purchase_amount = m.fba_purchase_amount ?? 0;
+                m.not_fba_purchase_amount = m.not_fba_purchase_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;

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

@@ -322,20 +322,46 @@
                             </div>
                             <div style="width:8%;"></div>
                         </div>
+                        @*<div class="item-row fa fa1" style="width:100%;">
+            <div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+            <div style="width:11.5%;">
+                <input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
+            </div>
+            <div style="width:8%;"></div>
+        </div>*@
                         <div class="item-row fa fa1" style="width:100%;">
-                            <div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
-                            <div style="width:11.5%;" class="fba_transfer_amount">0</div>
+                            <div style="width:11.5%;color:#bbb;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
                             <div style="width:11.5%;">
-                                <input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
+                                <input id="fba_transfer_allot_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
                             </div>
                             <div style="width:8%;"></div>
                         </div>
                         <div class="item-row fa fa1" style="width:100%;">
+                            <div style="width:11.5%;color:#bbb;" title="4.存货FBA仓在途(调拨计划)">4.存货FBA仓在途(调拨计划)</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;" class="fba_transfer_plan_amount">0</div>
+                            <div style="width:11.5%;">
+                                <input id="fba_transfer_plan_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
+                            </div>
+                            <div style="width:8%;"></div>
+                        </div>
+                        @*<div class="item-row fa fa1" style="width:100%;">
                             <div style="width:11.5%;color:#bbb;">4.存货非FBA仓在途</div>
                             <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
                             <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
@@ -347,9 +373,35 @@
                                 <input id="not_fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
                             </div>
                             <div style="width:8%;"></div>
+                        </div>*@
+                        <div class="item-row fa fa1" style="width:100%;">
+                            <div style="width:11.5%;color:#bbb;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
+                            <div style="width:11.5%;">
+                                <input id="not_fba_transfer_allot_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
+                            </div>
+                            <div style="width:8%;"></div>
+                        </div>
+                        <div class="item-row fa fa1" style="width:100%;">
+                            <div style="width:11.5%;color:#bbb;" title="6.存货非FBA仓在途(调拨计划)">6.存货非FBA仓在途(调拨计划)</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;" class="not_fba_purchase_amount">0</div>
+                            <div style="width:11.5%;">
+                                <input id="not_fba_purchase_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
+                            </div>
+                            <div style="width:8%;"></div>
                         </div>
                         <div class="item-row fa fa1" style="width:100%;">
-                            <div style="width:11.5%;color:#bbb;">5.存货半成品在库</div>
+                            <div style="width:11.5%;color:#bbb;">7.存货半成品在库</div>
                             <div style="width:11.5%;" class="semi_inventory_amount">0</div>
                             <div style="width:11.5%;" class="semi_inventory_amount">0</div>
                             <div style="width:11.5%;" class="semi_inventory_amount">0</div>
@@ -362,7 +414,7 @@
                             <div style="width:8%;"></div>
                         </div>
                         <div class="item-row fa fa1" style="width:100%;display:none;">
-                            <div style="width:11.5%;color:#bbb;">6.存货半成品在途</div>
+                            <div style="width:11.5%;color:#bbb;">8.存货半成品在途</div>
                             <div style="width:11.5%;" class="semi_transfer_amount">0</div>
                             <div style="width:11.5%;" class="semi_transfer_amount">0</div>
                             <div style="width:11.5%;" class="semi_transfer_amount">0</div>
@@ -401,7 +453,7 @@
                             <div style="width:8%;"><a class="btn btn-primary btn-xs" onclick="UpdateData('fa_other_assets');">更新</a></div>
                         </div>
                         <div class="item-row" style="width:100%;">
-                            <div style="width:11.5%;font-weight:bold;" onclick="showitem('fa1', this,759,'ldzc');">
+                            <div style="width:11.5%;font-weight:bold;" onclick="showitem('fa1', this,858,'ldzc');">
                                 流动资产合计
                                 <img src="@Url.Content("~/img/downicon.png")" style="width:10px;position:absolute;float:right;margin-top:10px;right:5px;" />
                             </div>