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
9ff67102
Commit
9ff67102
authored
Jan 02, 2021
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整新月销售利润报表
parent
95783178
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
19 deletions
+31
-19
dc_month_sales_profit.cs
Bailun.DC.Models/dc_month_sales_profit.cs
+6
-0
Program.cs
Bailun.DC.MonthSaleProfit/Program.cs
+1
-1
Services.cs
Bailun.DC.MonthSaleProfit/Services.cs
+0
-0
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+23
-17
common.js
Bailun.DC.Web/wwwroot/js/common.js
+1
-1
No files found.
Bailun.DC.Models/dc_month_sales_profit.cs
View file @
9ff67102
...
...
@@ -90,6 +90,12 @@ namespace Bailun.DC.Models
/// FBA费
/// </summary>
public
decimal
fee_fba
{
get
;
set
;
}
/// <summary>
/// 广告及宣传费用
/// </summary>
public
decimal
fee_ad
{
get
;
set
;
}
/// <summary>
/// 平台退款
/// </summary>
...
...
Bailun.DC.MonthSaleProfit/Program.cs
View file @
9ff67102
...
...
@@ -24,7 +24,7 @@ namespace Bailun.DC.MonthSaleProfit
// var start = DateTime.Parse("2020-12-01");
// //_services.Init(start);
//
//
_services.InitNew(start);
// _services.InitNew(start);
// //_services.InitNew4K(start);
// //_services.InitNew4K(start);
//}
...
...
Bailun.DC.MonthSaleProfit/Services.cs
View file @
9ff67102
This diff is collapsed.
Click to expand it.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
9ff67102
...
...
@@ -8595,6 +8595,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
cost_other
=
a
.
cost_other
.
ToString
(
"N2"
),
fee_fba
=
a
.
fee_fba
.
ToString
(
"N2"
),
fee_ad
=
a
.
fee_ad
.
ToString
(
"N2"
),
fee_finance
=
a
.
fee_finance
.
ToString
(
"N2"
),
fee_logistics_direct
=
a
.
fee_logistics_direct
.
ToString
(
"N2"
),
fee_logistics_first
=
a
.
fee_logistics_first
.
ToString
(
"N2"
),
...
...
@@ -8643,6 +8644,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"美容美甲产品"
,
"amount_sales_meirongmj"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"服装"
,
"amount_sales_fuzhuang"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"其他"
,
"amount_sales_other"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"退款"
,
"fee_refund"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"成本"
,
"cost"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"精油产品"
,
"cost_jingyou"
,
0
));
...
...
@@ -8653,11 +8655,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"其他"
,
"cost_other"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"平台
扣费及退款
"
,
"fee_platform_and_refund"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"平台
费用
"
,
"fee_platform_and_refund"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"平台费"
,
"fee_platform"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"FBA费"
,
"fee_fba"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"平台退款"
,
"fee_refund"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"平台提现回款"
,
"amount_withdraw"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广告及宣传费"
,
"fee_ad"
,
0
));
//listHead.Add(new Tuple<string, string, int>("平台提现回款", "amount_withdraw", 0));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"物流仓储费用"
,
"fee_logistics_storage"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"头程运输"
,
"fee_logistics_first"
,
0
));
...
...
@@ -8671,17 +8674,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"销售利润"
,
"profit_sales"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"销售毛利率"
,
"rate_profit_sales"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"财务费用"
,
"fee_finance"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"管理成本合计"
,
"managercost_count"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"香港百伦科技有限公司"
,
"managecost_bl_xg"
,
0
));
//
listHead.Add(new Tuple<string, string, int>("香港百伦科技有限公司", "managecost_bl_xg", 0));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州百伦供应链科技有限公司"
,
"managecost_bl_gz"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州歌戈儿生活科技有限公司"
,
"managecost_meijia"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"深圳前海扬杉创新科技有限公司"
,
"managercost_yangshan"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州信荟蓝科技有限公司"
,
"managercost_xinhuilan"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州电子服装仓"
,
"managercost_chengpincang"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州电子服装仓
&阳山
"
,
"managercost_chengpincang"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州迪致美容科技有限公司"
,
"managercost_dizhi"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"广州美甲生产仓"
,
"managercost_meijiashengchan"
,
0
));
//
listHead.Add(new Tuple<string, string, int>("广州美甲生产仓", "managercost_meijiashengchan", 0));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"财务费用"
,
"fee_finance"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"营业利润"
,
"profit"
,
1
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"营业毛利率"
,
"rate_profit"
,
0
));
...
...
@@ -8689,8 +8693,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"加:营业外收入"
,
"incoming_non_operating"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"减:营业外支出"
,
"pay_non_operating"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"实际利润"
,
"actual_profit"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"减:分红"
,
"dividend"
,
0
));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"利润结余"
,
"profit_balance"
,
0
));
//
listHead.Add(new Tuple<string, string, int>("减:分红", "dividend", 0));
//
listHead.Add(new Tuple<string, string, int>("利润结余", "profit_balance", 0));
listHead
.
Add
(
new
Tuple
<
string
,
string
,
int
>(
"净利率"
,
"rate_profit_actual"
,
1
));
var
listCount
=
new
List
<
dc_month_sales_profit
>();
...
...
@@ -8719,6 +8723,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m
.
dividend
=
item
.
Sum
(
a
=>
a
.
dividend
);
m
.
fee_fba
=
item
.
Sum
(
a
=>
a
.
fee_fba
);
m
.
fee_ad
=
item
.
Sum
(
a
=>
a
.
fee_ad
);
m
.
fee_finance
=
item
.
Sum
(
a
=>
a
.
fee_finance
);
m
.
fee_logistics_direct
=
item
.
Sum
(
a
=>
a
.
fee_logistics_direct
);
m
.
fee_logistics_first
=
item
.
Sum
(
a
=>
a
.
fee_logistics_first
);
...
...
@@ -8747,14 +8752,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m
.
pay_non_operating
=
item
.
Sum
(
a
=>
a
.
pay_non_operating
);
//销售额=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他
m
.
amount_sales
=
m
.
amount_sales_dianzi
+
m
.
amount_sales_fuzhuang
+
m
.
amount_sales_jiaju
+
m
.
amount_sales_jingyou
+
m
.
amount_sales_meirongmj
+
m
.
amount_sales_other
;
//销售额=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他
-平台退款
m
.
amount_sales
=
m
.
amount_sales_dianzi
+
m
.
amount_sales_fuzhuang
+
m
.
amount_sales_jiaju
+
m
.
amount_sales_jingyou
+
m
.
amount_sales_meirongmj
+
m
.
amount_sales_other
-
m
.
fee_refund
;
//产品成本=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他类型成本
m
.
cost
=
m
.
cost_dianzi
+
m
.
cost_fuzhuang
+
m
.
cost_jiaju
+
m
.
cost_jingyou
+
m
.
cost_meirongmj
+
m
.
cost_other
;
//平台
扣费及退款
m
.
fee_platform_and_refund
=
m
.
fee_platform
+
m
.
fee_fba
+
m
.
fee_
refun
d
;
//平台
费用
m
.
fee_platform_and_refund
=
m
.
fee_platform
+
m
.
fee_fba
+
m
.
fee_
a
d
;
//物流仓储费用 = 头程运输+直邮物流费+尾程费+海外仓仓储及其他费用
m
.
fee_logistics_storage
=
m
.
fee_logistics_first
+
m
.
fee_logistics_direct
+
m
.
fee_logistics_tail
+
m
.
fee_storage
;
...
...
@@ -8768,8 +8773,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//销售毛利率=销售利润/销售额
m
.
rate_profit_sales
=
m
.
amount_sales
>
0
?
m
.
profit_sales
/
m
.
amount_sales
:
0
;
//管理成本=
香港百伦+
广州百伦+美容美甲店+杨杉+信荟蓝+成品仓
m
.
managercost_count
=
m
.
managecost_bl_gz
+
m
.
managecost_
bl_xg
+
m
.
managecost_meijia
+
m
.
managercost_chengpincang
+
m
.
managercost_xinhuilan
+
m
.
managercost_yangshan
;
//管理成本=广州百伦+美容美甲店+杨杉+信荟蓝+成品仓
m
.
managercost_count
=
m
.
managecost_bl_gz
+
m
.
managecost_
meijia
+
m
.
managercost_chengpincang
+
m
.
managercost_xinhuilan
+
m
.
managercost_yangshan
+
m
.
managercost_dizhi
;
//营业利润=销售利润-管理成本合计-财务费用
m
.
profit
=
m
.
profit_sales
-
m
.
managercost_count
-
m
.
fee_finance
;
...
...
@@ -8780,8 +8785,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//实际利润=营业利润+其他收入+营业外收入-营业外支出
m
.
actual_profit
=
m
.
profit
+
m
.
incoming_other
+
m
.
incoming_non_operating
-
m
.
pay_non_operating
;
//利润结余=实际利润
-分红
m
.
profit_balance
=
m
.
actual_profit
-
m
.
dividend
;
//利润结余=实际利润
m
.
profit_balance
=
m
.
actual_profit
;
//净利率 = 利润结余/销售额
m
.
rate_profit_actual
=
m
.
amount_sales
>
0
?
m
.
profit_balance
/
m
.
amount_sales
:
0
;
...
...
@@ -8810,6 +8815,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
cost_other
=
a
.
cost_other
.
ToString
(
"N2"
),
fee_fba
=
a
.
fee_fba
.
ToString
(
"N2"
),
fee_ad
=
a
.
fee_ad
.
ToString
(
"N2"
),
fee_finance
=
a
.
fee_finance
.
ToString
(
"N2"
),
fee_logistics_direct
=
a
.
fee_logistics_direct
.
ToString
(
"N2"
),
fee_logistics_first
=
a
.
fee_logistics_first
.
ToString
(
"N2"
),
...
...
Bailun.DC.Web/wwwroot/js/common.js
View file @
9ff67102
var
baseUrl
=
'http://
localhost:59628/'
;
//'http://data.bailuntec.com';
//
var
baseUrl
=
'http://
data.bailuntec.com'
;
//'http://localhost:59628/';
//
var
globalOrderSort
=
''
;
var
globalOrderType
=
''
;
...
...
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