Commit b838e466 by guanzhenshan

收款改为负数,增加会计科目字段

parent 7a356637
......@@ -89,5 +89,10 @@ namespace Bailun.DC.Models
/// </summary>
public DateTime gmt_modify_time { get; set; }
/// <summary>
/// 会计科目名称
/// </summary>
public string accounting_subject_name { get; set; }
}
}
......@@ -753,6 +753,16 @@ namespace Bailun.DC.Services
}
list = cn.Query<dc_base_finance_managecost>(sql,sqlparam,null,true,2*60).ToList();
foreach(var item in list)
{
if(item.manage_cost_type==2)
{
item.amount = -(item.amount);
item.amount_rmb = -(item.amount_rmb);
}
}
return list.ToList();
}
}
......
......@@ -2254,13 +2254,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, (issub == 0 ? categoryname : ""), (issub != 0 ? categoryname : ""), (type == 1 ? headname : ""), paycompanyid);
var colNames = new List<string> {"费用单号","部门名称","付款主体名称","父级分类", "子分类",
"金额","币种", "人民币金额","收款单位","收款理由","付款时间" };
var colNames = new List<string> {"费用单号","一级部门","付款主体名称","费用类别", "会计科目",
"金额","币种", "人民币金额","收款单位","收款理由","付款时间","备注" };
var list = new List<string>();
foreach (var item in obj)
{
list.Add(item.no + "|" + item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.fee_sub_type + "|" +
list.Add(item.no + "|" + item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.accounting_subject_name + "|" +
item.amount + "|" + item.currency + "|" + item.amount_rmb + "|" + item.receive_unit + "|" + item.reason + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss")
);
}
......
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