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
ac51f058
Commit
ac51f058
authored
Jun 29, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同上
parent
af788aca
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
4 deletions
+34
-4
Program.cs
Bailun.DC.DailyPayAndIncoming/Program.cs
+5
-1
FinanceReportServices.cs
Bailun.DC.Services/FinanceReportServices.cs
+26
-0
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+3
-3
No files found.
Bailun.DC.DailyPayAndIncoming/Program.cs
View file @
ac51f058
...
...
@@ -27,7 +27,11 @@ namespace Bailun.DC.DailyPayAndIncoming
//{
// var _services = new Services();
// var start = DateTime.Parse("2020-06-01");
// var start = DateTime.Parse("2020-05-18");
// _services.Init(start, start.AddDays(1));
// _services.SaveMoneyFlowCount(start, start.AddDays(1));
// return;
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start);
...
...
Bailun.DC.Services/FinanceReportServices.cs
View file @
ac51f058
...
...
@@ -2766,6 +2766,32 @@ namespace Bailun.DC.Services
return
list
;
}
/// <summary>
/// 物流费用
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public
List
<
Models
.
dc_base_finance_logistics
>
ListLogisticFee
(
DateTime
start
,
DateTime
end
)
{
var
sqlparam
=
new
DynamicParameters
();
var
list
=
new
List
<
Models
.
dc_base_finance_logistics
>();
var
sql
=
$"select * from dc_base_finance_logistics where pay_time>='
{
start
.
ToString
(
"yyyy-MM-dd"
)}
' and pay_time<'
{
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd"
)}
'"
;
using
(
var
cn
=
new
MySqlConnection
(
Common
.
GlobalConfig
.
ConnectionString
))
{
if
(
cn
.
State
==
ConnectionState
.
Closed
)
{
cn
.
Open
();
}
list
=
cn
.
Query
<
dc_base_finance_logistics
>(
sql
,
sqlparam
,
null
,
true
,
2
*
60
).
ToList
();
return
list
.
ToList
();
}
}
#
endregion
#
region
尾程物流
...
...
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
ac51f058
...
...
@@ -7023,8 +7023,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
else
if
(
t
==
3
)
//物流
{
//物流费支出
var
listlg
=
new
Services
.
FinanceReportServices
().
ListLogisticFee
(
lgurl
);
//物流费支出
var
listlg
=
new
Services
.
FinanceReportServices
().
ListLogisticFee
(
start
,
start
);
//new Services.FinanceReportServices().ListLogisticFee(
lgurl);
var
colNames
=
new
List
<
string
>()
{
"单号"
,
"被出纳公司名"
,
"出纳时间"
,
"类型"
,
"部门"
,
"付款主体"
,
"费用主类型"
,
"金额"
};
...
...
@@ -7032,7 +7032,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
listval
=
new
List
<
string
>();
foreach
(
var
item
in
listlg
)
{
listval
.
Add
(
item
.
no
+
"|"
+
item
.
receive
Unit
+
"|"
+
item
.
payTime
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"|"
+
item
.
manageCostType
+
"|"
+
item
.
departmentName
+
"|"
+
item
.
companyName
+
"|"
+
item
.
feeSuperType
+
"|"
+
item
.
amountR
mb
listval
.
Add
(
item
.
no
+
"|"
+
item
.
receive
_unit
+
"|"
+
item
.
pay_time
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"|"
+
item
.
manage_cost_type
+
"|"
+
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
amount_r
mb
);
}
...
...
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