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
2b291c19
Commit
2b291c19
authored
Mar 20, 2021
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
d0c89100
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
dc_auto_turnover.cs
AutoTurnOver.DB/dc_auto_turnover.cs
+4
-4
transfer_profit_modal_dto.cs
AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs
+4
-0
No files found.
AutoTurnOver.DB/dc_auto_turnover.cs
View file @
2b291c19
...
...
@@ -2003,12 +2003,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
profit_data
.
freight_stock_amount_air
=
profit_data
.
quantity_final_air_difference_amount
<=
0
?
0
:
((
profit_data
.
freight_price_air_difference_amount
)
/
(
profit_data
.
quantity_final_air_difference_amount
));
profit_data
.
freight_stock_amount_ocean_30
=
profit_data
.
turnover_amount
<=
0
?
0
:
(
Math
.
Abs
(
profit_data
.
freight_price_ocean_30_difference
)
/
profit_data
.
turnover_amount
);
profit_data
.
freight_stock_amount_air_30
=
profit_data
.
turnover_amount
<=
0
?
0
:
(
Math
.
Abs
(
profit_data
.
freight_price_air_30_difference
)
/
profit_data
.
turnover_amount
);
profit_data
.
forecast_daily_weighted_sales
=
profit_data
.
turnover_days
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales
/
profit_data
.
turnover_days
);
profit_data
.
forecast_daily_weighted_sales_ocean
=
profit_data
.
turnover_days_ocean
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales_ocean
/
profit_data
.
turnover_days_ocean
);
profit_data
.
forecast_daily_weighted_sales_air
=
profit_data
.
turnover_days_air
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales_air
/
profit_data
.
turnover_days_air
);
var
formula_json
=
profit_data
.
ToJson
();
dc_report_profit_analysis
data
=
formula_json
.
ToObj
<
dc_report_profit_analysis
>();
data
.
forecast_daily_weighted_sales
=
profit_data
.
turnover_days
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales
/
profit_data
.
turnover_days
);
data
.
forecast_daily_weighted_sales_ocean
=
profit_data
.
turnover_days_ocean
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales_ocean
/
profit_data
.
turnover_days_ocean
);
data
.
forecast_daily_weighted_sales_air
=
profit_data
.
turnover_days_air
<=
0
?
0
:
Math
.
Round
(
profit_data
.
turnover_sales_air
/
profit_data
.
turnover_days_air
);
data
.
bailun_sku
=
bailun_sku
;
data
.
formula_json
=
formula_json
;
data
.
warehouse_code
=
warehouse_code
;
...
...
AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs
View file @
2b291c19
...
...
@@ -224,6 +224,10 @@ namespace AutoTurnOver.Models.Report
public
decimal
abroad_inbound_delivery_ocean
;
public
decimal
transfer_order_days_ocean
;
public
decimal
turnover_sales
;
public
decimal
forecast_daily_weighted_sales
{
get
;
set
;
}
public
decimal
forecast_daily_weighted_sales_ocean
{
get
;
set
;
}
public
decimal
forecast_daily_weighted_sales_air
{
get
;
set
;
}
/// <summary>
/// 调拨时长总销量
/// </summary>
...
...
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