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
b1e6c9f4
Commit
b1e6c9f4
authored
Dec 23, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整利息支出,改为从接口读取
parent
55c9f2a7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+7
-7
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
b1e6c9f4
...
...
@@ -389,7 +389,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//利息支出
var
listInterest
=
new
Services
.
FinanceReportServices
().
List
FinanceInterest
(
start
,
end
,
paycompanyid
);
//new Services.FinanceReportServices().List
InterestExpense(cwurl);
var
listInterest
=
new
Services
.
FinanceReportServices
().
ListInterestExpense
(
cwurl
);
//Edit by Allan at 20191217 for 更改数据源
var
list
=
new
Services
.
FinanceReportServices
().
ListFinanceManageCost
(
start
,
end
,
""
,
paycompanyid
);
//new Services.FinanceReportServices().ListOtherCost(url);
...
...
@@ -499,18 +499,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//广州电子服装仓
var
clothVal
=
0.00
M
;
var
objCloth
=
listInterest
.
Where
(
a
=>
a
.
company_v
al
!=
1
);
var
objCloth
=
listInterest
.
Where
(
a
=>
a
.
CompanyV
al
!=
1
);
if
(
objCloth
.
Count
()
>
0
)
{
clothVal
=
objCloth
.
Sum
(
a
=>
a
.
repay_interest_rmb
);
clothVal
=
objCloth
.
Sum
(
a
=>
a
.
RepayInterestRMB
);
}
//广州百伦
var
gzblVal
=
0.00
M
;
var
objGZBL
=
listInterest
.
Where
(
a
=>
a
.
company_v
al
==
1
);
var
objGZBL
=
listInterest
.
Where
(
a
=>
a
.
CompanyV
al
==
1
);
if
(
objGZBL
.
Count
()
>
0
)
{
gzblVal
=
objGZBL
.
Sum
(
a
=>
a
.
repay_interest_rmb
);
gzblVal
=
objGZBL
.
Sum
(
a
=>
a
.
RepayInterestRMB
);
}
if
(
clothVal
>
0
&&
clothindex
==
-
1
)
...
...
@@ -641,7 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
}
var
val
=
listInterest
.
Sum
(
a
=>
a
.
repay_interest_rmb
);
var
val
=
listInterest
.
Sum
(
a
=>
a
.
RepayInterestRMB
);
if
(
index_Interest
==
-
1
&&
val
>
0
)
{
...
...
@@ -707,7 +707,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
msg
=
list
.
Count
>
0
?
""
:
"成本接口返回了空记录。"
,
col
=
listCol
,
list
=
listValue
,
amount
=
Math
.
Round
(
list
.
Sum
(
a
=>
a
.
amount_rmb
)+
listInterest
.
Sum
(
a
=>
a
.
repay_interest_rmb
),
2
)
amount
=
Math
.
Round
(
list
.
Sum
(
a
=>
a
.
amount_rmb
)+
listInterest
.
Sum
(
a
=>
a
.
RepayInterestRMB
),
2
)
});
}
...
...
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