Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-center-auto
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
data-center-auto
Commits
728fc22e
Commit
728fc22e
authored
Aug 01, 2020
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
现金流页面渲染新增首单字段
parent
31ff08a5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
report.cs
AutoTurnOver.DB/report.cs
+2
-2
report_cash_flow_dao.cs
AutoTurnOver.DB/report_cash_flow_dao.cs
+3
-1
No files found.
AutoTurnOver.DB/report.cs
View file @
728fc22e
...
...
@@ -1828,7 +1828,7 @@ sum(case when occur_time>=@btime and data_type not in (2) then val else 0 end )
sum(case when occur_time<@btime and data_type in (2) then val else 0 end ) as 'last_income',
sum(case when occur_time<@btime and data_type not in (2) then val else 0 end ) as 'last_expend',
1 as 'type'
from dc_report_cash_flow_log where occur_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12) and warehouse_code!='' and is_delete=0
from dc_report_cash_flow_log where occur_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12
,13,14
) and warehouse_code!='' and is_delete=0
GROUP BY bailun_sku,warehouse_code;
insert dc_report_cash_flow_sku_group_temp(`warehouse_code`,`bailun_sku`,`balance`,`current_date_begin`,`current_date_end`,`last_date_begin`,`last_date_end`,`current_income`,`current_expend`,`last_income`,`last_expend`,`type`)
...
...
@@ -1845,7 +1845,7 @@ sum(case when pay_time>=@btime and data_type not in (2) then val else 0 end ) as
sum(case when pay_time<@btime and data_type in (2) then val else 0 end ) as 'last_income',
sum(case when pay_time<@btime and data_type not in (2) then val else 0 end ) as 'last_expend',
2 as 'type'
from dc_report_cash_flow_log where pay_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12) and warehouse_code!='' and is_delete=0
from dc_report_cash_flow_log where pay_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12
,13,14
) and warehouse_code!='' and is_delete=0
GROUP BY bailun_sku,warehouse_code;
...
...
AutoTurnOver.DB/report_cash_flow_dao.cs
View file @
728fc22e
...
...
@@ -1159,11 +1159,13 @@ GROUP BY platform_type,website";
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
7
},
date_type_str
=
"释放头程费用"
,
remarks
=
""
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
8
},
date_type_str
=
"尾程费用"
,
remarks
=
"oms 订单中海外仓发货的,支付时间 已 读取对应物流商的账期"
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
9
},
date_type_str
=
"新增采购费用"
,
remarks
=
" 1、采购系统的数据,外采订单直接读取订单支付时间。2、向自己工厂采购的(无需付款)的单,支付时间=下单时间 "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
13
},
date_type_str
=
"新增采购费用_首单"
,
remarks
=
" 采购首单费用,下单一个月之后如果有出单,讲转移到【新增采购费用】字段"
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
10
},
date_type_str
=
"新增头程费用"
,
remarks
=
" 调拨单的数据,支付时间 已 读取对应物流商的账期,注:调拨单需要付款之后才能获取到金额 "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
14
},
date_type_str
=
"新增头程费用_首单"
,
remarks
=
" 调拨首单费用,下单一个月之后如果有出单,讲转移到【新增头程费用】字段 "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
11
},
date_type_str
=
"fba费"
,
remarks
=
" "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
12
},
date_type_str
=
"paypal费"
,
remarks
=
" "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
4
,
3
},
date_type_str
=
"汇总利润"
,
remarks
=
" oms 中的订单,销售额 - 销售成本 - 尾程费 - 头程费 - 退款 - 平台费 - fba费 -paypal 费 (不包含广告费、上架费)"
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
2
,
3
,
5
,
8
,
9
,
10
,
11
,
12
},
date_type_str
=
"现金流结余"
,
remarks
=
" 销售金额 - 新增采购费用 - 新增头程费用 - 平台费用 - 尾程费用 "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
datas
.
Add
(
new
report_cash_flow_view_dto
{
date_type
=
new
List
<
int
>
{
2
,
3
,
5
,
8
,
9
,
10
,
11
,
12
,
13
,
14
},
date_type_str
=
"现金流结余"
,
remarks
=
" 销售金额 - 新增采购费用 - 新增头程费用 - 平台费用 - 尾程费用 "
,
dates
=
new
List
<
report_cash_flow_view_dto
.
date_dto
>()
});
var
btime
=
DateTime
.
Now
.
AddDays
(-
8
).
ToDayHome
();
var
etime
=
DateTime
.
Now
.
AddDays
(-
1
).
ToDayEnd
();
if
(
search
.
btime
!=
null
)
...
...
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