Skip to content

D
DataCenter_Core2.1_20190520
Commit 69fdd7c3 by guanzhenshan
Options

资产负债表增加半成品在库和在途区分百伦和哈倪曼的显示

parent e26dcac6
Showing with 70 additions and 1 deletion
Bailun.DC.Models/dc_balance_sheet.cs
......@@ -144,6 +144,12 @@ namespace Bailun.DC.Models
[Description("5.存货半成品在库")]
public decimal? semi_inventory_amount { get; set; }
[Description("百伦半成品在库")]
public decimal? semi_bailun_inventory_amount { get; set; }
[Description("哈尼曼半成品在库")]
public decimal? semi_hani_inventory_amount { get; set; }
[Description("6.FBA在途(不包调拨计划)")]
public decimal? fba_transfer_allot_amount { get; set; }
......@@ -167,6 +173,11 @@ namespace Bailun.DC.Models
/// </summary>
public decimal? semi_transfer_amount { get; set; }
[Description("百伦半成品在途")]
public decimal? semi_bailun_transfer_amount { get; set; }
[Description("哈尼曼半成品在途")]
public decimal? semi_hani_transfer_amount { get; set; }
/// <summary>
/// 一年内到期的非流动资产
/// </summary>
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -126,6 +126,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m.not_fba_purchase_amount = m.not_fba_purchase_amount ?? 0;
m.semi_bailun_inventory_amount = m.semi_bailun_inventory_amount ?? 0;
m.semi_hani_inventory_amount = m.semi_hani_inventory_amount ?? 0;
m.semi_bailun_transfer_amount = m.semi_bailun_transfer_amount ?? 0;
m.semi_hani_transfer_amount = m.semi_hani_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;
......
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
......@@ -413,6 +413,32 @@
</div>
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">7.1.百伦半成品在库</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;">
<input id="semi_bailun_inventory_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;">7.2.哈尼曼半成品在库</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_hani_inventory_amount">0</div>
<div style="width:11.5%;">
<input id="semi_hani_inventory_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%;display:none;">
<div style="width:11.5%;color:#bbb;">8.存货半成品在途</div>
<div style="width:11.5%;" class="semi_transfer_amount">0</div>
......@@ -427,6 +453,32 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">8.1.百伦半成品在途</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="semi_bailun_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;">8.2.哈尼曼半成品在途</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;" class="semi_hani_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="semi_hani_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%;">一年内到期的非流动资产</div>
<div style="width:11.5%;" class="fa_oneyear_noncurrent_assets">0</div>
<div style="width:11.5%;" class="fa_oneyear_noncurrent_assets">0</div>
......@@ -453,7 +505,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,858,'ldzc');">
<div style="width:11.5%;font-weight:bold;" onclick="showitem('fa1', this,990,'ldzc');">
流动资产合计
<img src="@Url.Content("~/img/downicon.png")" style="width:10px;position:absolute;float:right;margin-top:10px;right:5px;" />
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment