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
56cb7b69
Commit
56cb7b69
authored
Jul 17, 2019
by
lizefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实时库存导出,新增监控状态
parent
949dc754
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
daily.cs
AutoTurnOver.DB/daily.cs
+3
-0
dc_base_stock.cs
AutoTurnOver.Models/dc_base_stock.cs
+1
-0
DailyController.cs
AutoTurnOver/Controllers/DailyController.cs
+3
-1
No files found.
AutoTurnOver.DB/daily.cs
View file @
56cb7b69
...
@@ -240,6 +240,7 @@ dc_base_stock as t1
...
@@ -240,6 +240,7 @@ dc_base_stock as t1
left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
left join dc_mid_transit as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_mid_transit as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_base_tort as t5 on t1.bailun_sku = t5.bailun_sku
left join dc_base_tort as t5 on t1.bailun_sku = t5.bailun_sku
where 1=1"
;
where 1=1"
;
}
}
else
else
...
@@ -253,6 +254,7 @@ t3.buyer_name,t3.sku_title_en,t3.product_inner_code,
...
@@ -253,6 +254,7 @@ t3.buyer_name,t3.sku_title_en,t3.product_inner_code,
t4.quantity_purchase as 'realtime_quantity_purchase',t4.quantity_transfer as 'realtime_quantity_transfer',
t4.quantity_purchase as 'realtime_quantity_purchase',t4.quantity_transfer as 'realtime_quantity_transfer',
t1.bailun_sku,t1.warehouse_code,t4.quantity_out_stock,t4.gmt_out_stock_modified,t3.weight,t3.unit_price,
t1.bailun_sku,t1.warehouse_code,t4.quantity_out_stock,t4.gmt_out_stock_modified,t3.weight,t3.unit_price,
(case when t5.id is null then '未侵权' else '侵权' end) as 'has_tort',
(case when t5.id is null then '未侵权' else '侵权' end) as 'has_tort',
( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status',
t6.history_sevenday_sales,t6.history_fourteenday_sales,t6.history_thirtyday_sales,
t6.history_sevenday_sales,t6.history_fourteenday_sales,t6.history_thirtyday_sales,
t6.history_sevenday_sales_ebay,t6.history_fourteenday_sales_ebay,t6.history_thirtyday_sales_ebay,
t6.history_sevenday_sales_ebay,t6.history_fourteenday_sales_ebay,t6.history_thirtyday_sales_ebay,
t1.*
t1.*
...
@@ -263,6 +265,7 @@ left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
...
@@ -263,6 +265,7 @@ left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
left join dc_mid_transit as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_mid_transit as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_base_tort as t5 on t1.bailun_sku = t5.bailun_sku
left join dc_base_tort as t5 on t1.bailun_sku = t5.bailun_sku
left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
where 1=1
where 1=1
"
;
"
;
}
}
...
...
AutoTurnOver.Models/dc_base_stock.cs
View file @
56cb7b69
...
@@ -165,6 +165,7 @@ namespace AutoTurnOver.Models
...
@@ -165,6 +165,7 @@ namespace AutoTurnOver.Models
public
class
dc_base_stock_dto
:
dc_base_stock
public
class
dc_base_stock_dto
:
dc_base_stock
{
{
public
int
monitor_status
{
get
;
set
;
}
public
string
warehouse_name
{
get
;
set
;
}
public
string
warehouse_name
{
get
;
set
;
}
public
string
sku_name
{
get
;
set
;
}
public
string
sku_name
{
get
;
set
;
}
/// <summary>
/// <summary>
...
...
AutoTurnOver/Controllers/DailyController.cs
View file @
56cb7b69
...
@@ -135,7 +135,7 @@ namespace AutoTurnOver.Controllers
...
@@ -135,7 +135,7 @@ namespace AutoTurnOver.Controllers
,
"订货数量"
,
"运输在途"
,
"中转仓库存"
,
"冻结库存"
,
"供应商库存"
,
"预售库存"
,
"不良品库存"
,
"在途库存"
,
"收货待检"
,
"订货数量"
,
"运输在途"
,
"中转仓库存"
,
"冻结库存"
,
"供应商库存"
,
"预售库存"
,
"不良品库存"
,
"在途库存"
,
"收货待检"
,
"待上架"
,
"可配库存"
,
"销售可用库存(聚合)"
,
"销售可用库存(私有)"
,
"销售可用库存(共享)"
,
"在仓库存(共享)"
,
"在仓库存(私有)"
,
"在仓库存(聚合)"
,
"仓库占用(共享)"
,
"待上架"
,
"可配库存"
,
"销售可用库存(聚合)"
,
"销售可用库存(私有)"
,
"销售可用库存(共享)"
,
"在仓库存(共享)"
,
"在仓库存(私有)"
,
"在仓库存(聚合)"
,
"仓库占用(共享)"
,
"仓库占用(私有)"
,
"仓库占用(聚合)"
,
"活动占用"
,
"单占用(私有)"
,
"订单占用(共享)"
,
"订单占用(聚合)"
,
"环球更新时间"
,
"供应商"
,
"采购员"
,
"重量"
,
"单价"
,
"已发货库存"
,
"实时缺货"
,
"是否侵权"
,
,
"仓库占用(私有)"
,
"仓库占用(聚合)"
,
"活动占用"
,
"单占用(私有)"
,
"订单占用(共享)"
,
"订单占用(聚合)"
,
"环球更新时间"
,
"供应商"
,
"采购员"
,
"重量"
,
"单价"
,
"已发货库存"
,
"实时缺货"
,
"是否侵权"
,
"过去7日日均销量"
,
"过去14日日均销量"
,
"过去30日日均销量"
,
"过去7日Eaby日均销量"
,
"过去14日Eaby日均销量"
,
"过去30日Eaby日均销量"
"过去7日日均销量"
,
"过去14日日均销量"
,
"过去30日日均销量"
,
"过去7日Eaby日均销量"
,
"过去14日Eaby日均销量"
,
"过去30日Eaby日均销量"
,
"监控状态"
};
};
foreach
(
var
item
in
cols
)
foreach
(
var
item
in
cols
)
{
{
...
@@ -196,6 +196,8 @@ namespace AutoTurnOver.Controllers
...
@@ -196,6 +196,8 @@ namespace AutoTurnOver.Controllers
row
[
"过去7日Eaby日均销量"
]
=
itemData
.
history_sevenday_sales_ebay
;
row
[
"过去7日Eaby日均销量"
]
=
itemData
.
history_sevenday_sales_ebay
;
row
[
"过去14日Eaby日均销量"
]
=
itemData
.
history_fourteenday_sales_ebay
;
row
[
"过去14日Eaby日均销量"
]
=
itemData
.
history_fourteenday_sales_ebay
;
row
[
"过去30日Eaby日均销量"
]
=
itemData
.
history_thirtyday_sales_ebay
;
row
[
"过去30日Eaby日均销量"
]
=
itemData
.
history_thirtyday_sales_ebay
;
row
[
"监控状态"
]
=
itemData
.
monitor_status
==
0
?
"监控中"
:
"停止监控"
;
table
.
Rows
.
Add
(
row
);
table
.
Rows
.
Add
(
row
);
}
}
...
...
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