Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
6803da7f
Commit
6803da7f
authored
Jan 02, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
管理成本导出明细增加费用单号等字段
parent
7fdd7c5f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
28 deletions
+24
-28
Program.cs
Bailun.DC.DailyPurchaseSellStock/Program.cs
+16
-20
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+8
-8
No files found.
Bailun.DC.DailyPurchaseSellStock/Program.cs
View file @
6803da7f
...
@@ -7,29 +7,25 @@ namespace Bailun.DC.DailyPurchaseSellStock
...
@@ -7,29 +7,25 @@ namespace Bailun.DC.DailyPurchaseSellStock
{
{
class
Program
class
Program
{
{
static
async
Task
Main
(
string
[]
args
)
//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)
//{
//{
// var _services = new Services();
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// var start = DateTime.Parse("2019-10-01");
// while (start.AddDays(1) < DateTime.Now)
// {
// {
//
Console.WriteLine(start
);
//
services.AddHostedService<Services>(
);
//
_services.Init(start
);
//
}
);
// start = start.AddDays(1);
//
}
//
await builder.RunConsoleAsync();
//}
//}
static
void
Main
(
string
[]
args
)
{
var
_services
=
new
Services
();
var
start
=
DateTime
.
Parse
(
"2019-12-31"
);
_services
.
Init
(
start
);
}
}
}
}
}
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
6803da7f
...
@@ -1106,14 +1106,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -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
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
>();
var
list
=
new
List
<
string
>();
foreach
(
var
item
in
obj
)
foreach
(
var
item
in
obj
)
{
{
list
.
Add
(
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
fee_sub_type
+
"|"
+
item
.
amount
+
"|"
+
list
.
Add
(
item
.
no
+
"|"
+
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
fee_sub_type
+
"|"
+
item
.
currency
+
"|"
+
item
.
amount_rmb
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
...
@@ -1155,14 +1155,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
obj
=
new
Services
.
FinanceReportServices
().
ListFinanceManageCost
(
start
,
end
,
""
,
""
,
""
,
paycompanyid
);
var
obj
=
new
Services
.
FinanceReportServices
().
ListFinanceManageCost
(
start
,
end
,
""
,
""
,
""
,
paycompanyid
);
var
colNames
=
new
List
<
string
>
{
"
部门名称"
,
"付款主体名称"
,
"父级分类"
,
"子分类"
,
"金额
"
,
var
colNames
=
new
List
<
string
>
{
"
费用单号"
,
"部门名称"
,
"付款主体名称"
,
"父级分类"
,
"子分类
"
,
"币种"
,
"人民币金额
"
};
"金额"
,
"币种"
,
"人民币金额"
,
"收款理由"
,
"付款时间
"
};
var
list
=
new
List
<
string
>();
var
list
=
new
List
<
string
>();
foreach
(
var
item
in
obj
)
foreach
(
var
item
in
obj
)
{
{
list
.
Add
(
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
fee_sub_type
+
"|"
+
item
.
amount
+
"|"
+
list
.
Add
(
item
.
no
+
"|"
+
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
fee_sub_type
+
"|"
+
item
.
currency
+
"|"
+
item
.
amount_rmb
item
.
amount
+
"|"
+
item
.
currency
+
"|"
+
item
.
amount_rmb
+
"|"
+
item
.
reason
+
"|"
+
item
.
pay_time
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
);
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment