Commit 6803da7f by guanzhenshan

管理成本导出明细增加费用单号等字段

parent 7fdd7c5f
......@@ -7,29 +7,25 @@ namespace Bailun.DC.DailyPurchaseSellStock
{
class Program
{
static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//static async Task Main(string[] args)
//{
// var _services = new Services();
// var start = DateTime.Parse("2019-10-01");
// while (start.AddDays(1) < DateTime.Now)
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// Console.WriteLine(start);
// _services.Init(start);
// start = start.AddDays(1);
// }
// services.AddHostedService<Services>();
// });
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{
var _services = new Services();
var start = DateTime.Parse("2019-12-31");
_services.Init(start);
}
}
}
......@@ -1106,14 +1106,14 @@ 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.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.fee_sub_type + "|" + item.amount + "|" +
item.currency + "|" + item.amount_rmb
list.Add(item.no+"|"+ item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.fee_sub_type + "|" +
item.amount + "|" + item.currency + "|" + item.amount_rmb+"|"+item.reason+"|"+item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss")
);
}
......@@ -1155,14 +1155,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, "", "", "", paycompanyid);
var colNames = new List<string> {"部门名称","付款主体名称","父级分类", "子分类", "金额",
"币种", "人民币金额" };
var colNames = new List<string> {"费用单号","部门名称","付款主体名称","父级分类", "子分类",
"金额","币种", "人民币金额","收款理由","付款时间" };
var list = new List<string>();
foreach (var item in obj)
{
list.Add(item.department_name+"|"+item.company_name+"|"+item.fee_super_type+"|"+item.fee_sub_type+"|"+item.amount+"|"+
item.currency+"|"+item.amount_rmb
list.Add(item.no + "|" + item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.fee_sub_type + "|" +
item.amount + "|" + item.currency + "|" + item.amount_rmb + "|" + 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