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
ef4f9dc5
Commit
ef4f9dc5
authored
Mar 16, 2021
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
周转表新增字母sku区分,母sku不出采购建议
parent
238597f8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
9 deletions
+11
-9
dc_auto_turnover.cs
AutoTurnOver.DB/dc_auto_turnover.cs
+9
-9
dc_base_mother_sku_dao.cs
AutoTurnOver.DB/dc_base_mother_sku_dao.cs
+0
-0
purchase_advise.cs
AutoTurnOver.DB/purchase_advise.cs
+1
-0
dc_auto_turnover.cs
AutoTurnOver.Models/dc_auto_turnover.cs
+0
-0
dc_base_mother_sku.cs
AutoTurnOver.Models/dc_base_mother_sku.cs
+1
-0
No files found.
AutoTurnOver.DB/dc_auto_turnover.cs
View file @
ef4f9dc5
...
@@ -1350,9 +1350,9 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
...
@@ -1350,9 +1350,9 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
formula
=
$" 历史调拨单费用平均值 "
formula
=
$" 历史调拨单费用平均值 "
});
});
modalData
.
transfer_days_air
=
result_air
.
transfer_delivery
+
(
(
int
)
Math
.
Ceiling
(
result_air
.
abroad_inbound_delivery
))
+
((
int
)
Math
.
Ceiling
(
result_air
.
transfer_bale_delivery
)
);
modalData
.
transfer_days_air
=
result_air
.
transfer_delivery
+
(
result_air
.
abroad_inbound_delivery
)
+
(
result_air
.
transfer_bale_delivery
);
modalData
.
transfer_days
=
result
.
transfer_delivery
+
(
(
int
)
Math
.
Ceiling
(
result
.
abroad_inbound_delivery
))
+
((
int
)
Math
.
Ceiling
(
result
.
transfer_bale_delivery
)
);
modalData
.
transfer_days
=
result
.
transfer_delivery
+
(
result
.
abroad_inbound_delivery
)+
(
result
.
transfer_bale_delivery
);
modalData
.
transfer_days_ocean
=
result_ocean
.
transfer_delivery
+
(
(
int
)
Math
.
Ceiling
(
result_ocean
.
abroad_inbound_delivery
))
+
((
int
)
Math
.
Ceiling
(
result_ocean
.
transfer_bale_delivery
)
);
modalData
.
transfer_days_ocean
=
result_ocean
.
transfer_delivery
+
(
result_ocean
.
abroad_inbound_delivery
)
+
(
result_ocean
.
transfer_bale_delivery
);
modalData
.
transfer_sales
=
sales_details
.
Where
((
s
,
a_index
)=>
a_index
>
7
&&
a_index
<=
(
7
+
modalData
.
transfer_days
)).
Sum
();
modalData
.
transfer_sales
=
sales_details
.
Where
((
s
,
a_index
)=>
a_index
>
7
&&
a_index
<=
(
7
+
modalData
.
transfer_days
)).
Sum
();
modalData
.
transfer_sales_air
=
sales_details_air
.
Where
((
s
,
a_index
)=>
a_index
>
7
&&
a_index
<=
(
7
+
modalData
.
transfer_days_air
)).
Sum
();
modalData
.
transfer_sales_air
=
sales_details_air
.
Where
((
s
,
a_index
)=>
a_index
>
7
&&
a_index
<=
(
7
+
modalData
.
transfer_days_air
)).
Sum
();
...
@@ -1402,7 +1402,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
...
@@ -1402,7 +1402,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
modalData
.
turnover_days
=
result
.
turnover_days
;
modalData
.
turnover_days
=
result
.
turnover_days
;
modalData
.
purchase_create_order_days
=
result
.
purchase_create_order_days
??
0
;
modalData
.
purchase_create_order_days
=
result
.
purchase_create_order_days
;
modalData
.
payment_before_delivery
=
result
.
payment_before_delivery
;
modalData
.
payment_before_delivery
=
result
.
payment_before_delivery
;
modalData
.
supplier_delivery
=
result
.
supplier_delivery
;
modalData
.
supplier_delivery
=
result
.
supplier_delivery
;
modalData
.
inspection_delivery_days
=
result
.
inspection_delivery
;
modalData
.
inspection_delivery_days
=
result
.
inspection_delivery
;
...
@@ -1410,20 +1410,20 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
...
@@ -1410,20 +1410,20 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
modalData
.
abroad_inbound_delivery
=
result
.
abroad_inbound_delivery
;
modalData
.
abroad_inbound_delivery
=
result
.
abroad_inbound_delivery
;
modalData
.
transfer_bale_delivery
=
result
.
transfer_bale_delivery
;
modalData
.
transfer_bale_delivery
=
result
.
transfer_bale_delivery
;
modalData
.
transfer_order_days
=
result
.
transfer_order_days
;
modalData
.
transfer_order_days
=
result
.
transfer_order_days
;
modalData
.
sail_days
=
(
int
)
Math
.
Ceiling
(
result
.
transfer_sail_days
)
;
modalData
.
sail_days
=
result
.
transfer_sail_days
;
modalData
.
turnover_days_air
=
result_air
.
turnover_days
;
modalData
.
turnover_days_air
=
result_air
.
turnover_days
;
modalData
.
purchase_create_order_days_air
=
result_air
.
purchase_create_order_days
??
0
;
modalData
.
purchase_create_order_days_air
=
result_air
.
purchase_create_order_days
;
modalData
.
payment_before_delivery_air
=
result_air
.
payment_before_delivery
;
modalData
.
payment_before_delivery_air
=
result_air
.
payment_before_delivery
;
modalData
.
supplier_delivery_air
=
result_air
.
supplier_delivery
;
modalData
.
supplier_delivery_air
=
result_air
.
supplier_delivery
;
modalData
.
inspection_delivery_days_air
=
result_air
.
inspection_delivery
;
modalData
.
inspection_delivery_days_air
=
result_air
.
inspection_delivery
;
modalData
.
transfer_delivery_air
=
result_air
.
transfer_delivery
;
modalData
.
transfer_delivery_air
=
result_air
.
transfer_delivery
;
modalData
.
abroad_inbound_delivery_air
=
result_air
.
abroad_inbound_delivery
;
modalData
.
abroad_inbound_delivery_air
=
result_air
.
abroad_inbound_delivery
;
modalData
.
transfer_bale_delivery_air
=
result_air
.
transfer_bale_delivery
;
modalData
.
transfer_bale_delivery_air
=
result_air
.
transfer_bale_delivery
;
modalData
.
sail_days_air
=
(
int
)
Math
.
Ceiling
(
result_air
.
transfer_sail_days
)
;
modalData
.
sail_days_air
=
result_air
.
transfer_sail_days
;
modalData
.
transfer_order_days_air
=
result_air
.
transfer_order_days
;
modalData
.
transfer_order_days_air
=
result_air
.
transfer_order_days
;
datas
.
FirstOrDefault
(
s
=>
s
.
name
==
"空运周转天数"
).
days
.
Add
(
new
transfer_profit_dto
.
day_dto
datas
.
FirstOrDefault
(
s
=>
s
.
name
==
"空运周转天数"
).
days
.
Add
(
new
transfer_profit_dto
.
day_dto
{
{
...
@@ -1434,7 +1434,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
...
@@ -1434,7 +1434,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
});
});
modalData
.
turnover_days_ocean
=
result_ocean
.
turnover_days
;
modalData
.
turnover_days_ocean
=
result_ocean
.
turnover_days
;
modalData
.
purchase_create_order_days_ocean
=
result_ocean
.
purchase_create_order_days
??
0
;
modalData
.
purchase_create_order_days_ocean
=
result_ocean
.
purchase_create_order_days
;
modalData
.
payment_before_delivery_ocean
=
result_ocean
.
payment_before_delivery
;
modalData
.
payment_before_delivery_ocean
=
result_ocean
.
payment_before_delivery
;
modalData
.
supplier_delivery_ocean
=
result_ocean
.
supplier_delivery
;
modalData
.
supplier_delivery_ocean
=
result_ocean
.
supplier_delivery
;
modalData
.
inspection_delivery_days_ocean
=
result_ocean
.
inspection_delivery
;
modalData
.
inspection_delivery_days_ocean
=
result_ocean
.
inspection_delivery
;
...
@@ -1442,7 +1442,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
...
@@ -1442,7 +1442,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
modalData
.
abroad_inbound_delivery_ocean
=
result_ocean
.
abroad_inbound_delivery
;
modalData
.
abroad_inbound_delivery_ocean
=
result_ocean
.
abroad_inbound_delivery
;
modalData
.
transfer_bale_delivery_ocean
=
result_ocean
.
transfer_bale_delivery
;
modalData
.
transfer_bale_delivery_ocean
=
result_ocean
.
transfer_bale_delivery
;
modalData
.
transfer_order_days_ocean
=
result_ocean
.
transfer_order_days
;
modalData
.
transfer_order_days_ocean
=
result_ocean
.
transfer_order_days
;
modalData
.
sail_days_ocean
=
(
int
)
Math
.
Ceiling
(
result_ocean
.
transfer_sail_days
)
;
modalData
.
sail_days_ocean
=
result_ocean
.
transfer_sail_days
;
datas
.
FirstOrDefault
(
s
=>
s
.
name
==
"海运周转天数"
).
days
.
Add
(
new
transfer_profit_dto
.
day_dto
datas
.
FirstOrDefault
(
s
=>
s
.
name
==
"海运周转天数"
).
days
.
Add
(
new
transfer_profit_dto
.
day_dto
{
{
has_int
=
true
,
has_int
=
true
,
...
...
AutoTurnOver.DB/dc_base_mother_sku_dao.cs
View file @
ef4f9dc5
This diff is collapsed.
Click to expand it.
AutoTurnOver.DB/purchase_advise.cs
View file @
ef4f9dc5
...
@@ -509,6 +509,7 @@ t9.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage'
...
@@ -509,6 +509,7 @@ t9.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage'
left join dc_auto_replace_logistics_task as tr_task on t1.auto_replace_logistics_task_id = tr_task.id
left join dc_auto_replace_logistics_task as tr_task on t1.auto_replace_logistics_task_id = tr_task.id
left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse_code = t9.warehouse_code
left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse_code = t9.warehouse_code
where 1=1
where 1=1
and t1.`is_mother_sku`=0
and t6.`status`=2
and t6.`status`=2
-- and (t1.history_fourteenday_sales>0 or t1.quantity_out_stock>0 )
-- and (t1.history_fourteenday_sales>0 or t1.quantity_out_stock>0 )
and ( t5.`status`=0 or t5.`status` is null ) and t7.sum_quantity_init_advise>0
and ( t5.`status`=0 or t5.`status` is null ) and t7.sum_quantity_init_advise>0
...
...
AutoTurnOver.Models/dc_auto_turnover.cs
View file @
ef4f9dc5
This diff is collapsed.
Click to expand it.
AutoTurnOver.Models/dc_base_mother_sku.cs
View file @
ef4f9dc5
...
@@ -53,6 +53,7 @@ namespace AutoTurnOver.Models
...
@@ -53,6 +53,7 @@ namespace AutoTurnOver.Models
}
public
class
dc_base_mother_sku_map_dto
:
dc_base_mother_sku_map
}
public
class
dc_base_mother_sku_map_dto
:
dc_base_mother_sku_map
{
{
public
string
warehouse_name
{
get
;
set
;
}
public
string
warehouse_name
{
get
;
set
;
}
public
int
storage_capacity
{
get
;
set
;
}
}
}
public
class
dc_base_mother_sku_log_dto
:
dc_base_mother_sku_log
public
class
dc_base_mother_sku_log_dto
:
dc_base_mother_sku_log
{
{
...
...
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