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
b838e466
Commit
b838e466
authored
Jan 30, 2021
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款改为负数,增加会计科目字段
parent
7a356637
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
dc_base_finance_managecost.cs
Bailun.DC.Models/dc_base_finance_managecost.cs
+5
-0
FinanceReportServices.cs
Bailun.DC.Services/FinanceReportServices.cs
+10
-0
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+3
-3
No files found.
Bailun.DC.Models/dc_base_finance_managecost.cs
View file @
b838e466
...
@@ -89,5 +89,10 @@ namespace Bailun.DC.Models
...
@@ -89,5 +89,10 @@ namespace Bailun.DC.Models
/// </summary>
/// </summary>
public
DateTime
gmt_modify_time
{
get
;
set
;
}
public
DateTime
gmt_modify_time
{
get
;
set
;
}
/// <summary>
/// 会计科目名称
/// </summary>
public
string
accounting_subject_name
{
get
;
set
;
}
}
}
}
}
Bailun.DC.Services/FinanceReportServices.cs
View file @
b838e466
...
@@ -753,6 +753,16 @@ namespace Bailun.DC.Services
...
@@ -753,6 +753,16 @@ namespace Bailun.DC.Services
}
}
list
=
cn
.
Query
<
dc_base_finance_managecost
>(
sql
,
sqlparam
,
null
,
true
,
2
*
60
).
ToList
();
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
();
return
list
.
ToList
();
}
}
}
}
...
...
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
b838e466
...
@@ -2254,13 +2254,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -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
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
.
no
+
"|"
+
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
fee_sub_typ
e
+
"|"
+
list
.
Add
(
item
.
no
+
"|"
+
item
.
department_name
+
"|"
+
item
.
company_name
+
"|"
+
item
.
fee_super_type
+
"|"
+
item
.
accounting_subject_nam
e
+
"|"
+
item
.
amount
+
"|"
+
item
.
currency
+
"|"
+
item
.
amount_rmb
+
"|"
+
item
.
receive_unit
+
"|"
+
item
.
reason
+
"|"
+
item
.
pay_time
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
item
.
amount
+
"|"
+
item
.
currency
+
"|"
+
item
.
amount_rmb
+
"|"
+
item
.
receive_unit
+
"|"
+
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