Commit 3f8e11f7 by guanzhenshan

调整新资产负债表

parent 32c4be44
...@@ -221,5 +221,9 @@ namespace Bailun.DC.Models ...@@ -221,5 +221,9 @@ namespace Bailun.DC.Models
/// </summary> /// </summary>
public string lastupdateusername { get; set; } public string lastupdateusername { get; set; }
/// <summary>
/// 是否编辑的,1:是,0:否
/// </summary>
public int isedit { get; set; }
} }
} }
...@@ -730,7 +730,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code ...@@ -730,7 +730,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
profit_retained = 0, profit_retained = 0,
month = day.ToString("yyyy-MM"), month = day.ToString("yyyy-MM"),
isedit = 0,
}; };
......
...@@ -721,6 +721,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -721,6 +721,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
oe_count = item.oe_count + objEdit.oe_count, oe_count = item.oe_count + objEdit.oe_count,
count_liabilities_and_oe = item.count_liabilities_and_oe + objEdit.count_liabilities_and_oe, count_liabilities_and_oe = item.count_liabilities_and_oe + objEdit.count_liabilities_and_oe,
statistical_time = item.statistical_time,
company_name = item.company_name,
company_value = item.company_value
}; };
listCount.Add(m); listCount.Add(m);
......
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