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
310a7735
Commit
310a7735
authored
Nov 26, 2020
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
b6491ca5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
9 deletions
+14
-9
appsettings.prod.json
AutoGeneratePurchaseAdvise/appsettings.prod.json
+1
-1
report.cs
AutoTurnOver.DB/report.cs
+10
-5
appsettings.prod.json
AutoTurnOver.Purchase.AverageTarget/appsettings.prod.json
+1
-1
appsettings.prod.json
ResetOutofstock/appsettings.prod.json
+1
-1
appsettings.prod.json
ShortagePush/appsettings.prod.json
+1
-1
No files found.
AutoGeneratePurchaseAdvise/appsettings.prod.json
View file @
310a7735
{
"ConnectionStrings"
:
{
"Default"
:
"server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
,
"ReadOnly"
:
"server=10.0.8.
15
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
"ReadOnly"
:
"server=10.0.8.
21
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
},
"PushBuyPlan"
:
"http://api.purchase.bailuntec.com/api/CreatePlanToPurchase"
,
"QiNiu"
:
{
...
...
AutoTurnOver.DB/report.cs
View file @
310a7735
...
...
@@ -467,7 +467,6 @@ where ( t_db.hq_type!='国内仓' or t2.buyer_name not in ('张莹霞','张莹
}
else
{
var
conn
=
_connection
;
var
shortage_list
=
new
List
<
dc_auto_shortage_push
>();
// 缺货推送
string
sql
=
@"select
...
...
@@ -532,7 +531,7 @@ and not exists ( select * from dc_auto_shortage_push_not_config where dc_auto_sh
sql
+=
" and !(t2.develop_time>='2020-10-01' and t2.buyer_name not in ('张莹霞','赵美聪','甄杰靖','张莹霞') and t1.warehouse_code in ('GZBLWH') ) "
;
}
}
shortage_list
.
AddRange
(
con
n
.
Query
<
dc_auto_shortage_push
>(
sql
,
new
{
platform
=
platform
},
commandTimeout
:
0
));
shortage_list
.
AddRange
(
_connectio
n
.
Query
<
dc_auto_shortage_push
>(
sql
,
new
{
platform
=
platform
},
commandTimeout
:
0
));
// 0库存推送
string
no_library_sql
=
@" select t1.bailun_sku,
...
...
@@ -1103,7 +1102,6 @@ end
List
<
string
>
rule1
=
new
List
<
string
>
{
"GBYKD"
,
"JZHYBLGC"
,
"MDBLWYT"
,
"MXBLWYT"
,
"BLUSGDC"
,
"GBBMHBL"
,
"GB4PXBL"
,
"DEBLDG"
,
"USGCBL"
,
"USHWBL"
,
"US4PXBL"
,
"AUWYTBL"
,
"AU4PXBL"
,
"GBWYTUK"
,
"GBLQST"
};
List
<
string
>
ch_rule1
=
new
List
<
string
>(){
"GZBLWH"
,
"BLGZ03"
};
var
conn
=
_connection
;
var
shortage_list
=
new
List
<
dc_return_goods_push
>();
// 回货速改推送
string
sql
=
@"select
...
...
@@ -1154,7 +1152,6 @@ left join holiday_supplier_view as t_sp on t2.suppliers_id = t_sp.supplier_id
where
t_sp.supplier_id is null and
t1.platform=@platform
and ( t1.has_return_goods=0 or ( t_stock.update_time>t1.last_return_goods_date and t_db.hq_type not in ( '国内仓' ) and t1.platform='ebay' ) )
and
(
case
...
...
@@ -1165,7 +1162,15 @@ end
)
"
;
shortage_list
.
AddRange
(
conn
.
Query
<
dc_return_goods_push
>(
sql
,
new
{
platform
=
platform
,
rule1
=
rule1
,
ch_rule1
=
ch_rule1
},
commandTimeout
:
0
));
if
(
platform
==
"ebay"
)
{
sql
+=
" and ( t1.has_return_goods=0 or ( t_stock.update_time>t1.last_return_goods_date and t_db.hq_type not in ( '国内仓' ) ) ) "
;
}
else
{
sql
+=
" and t1.has_return_goods=0 "
;
}
shortage_list
.
AddRange
(
_connection
.
Query
<
dc_return_goods_push
>(
sql
,
new
{
platform
=
platform
,
rule1
=
rule1
,
ch_rule1
=
ch_rule1
},
commandTimeout
:
0
));
return
shortage_list
;
...
...
AutoTurnOver.Purchase.AverageTarget/appsettings.prod.json
View file @
310a7735
{
"ConnectionStrings"
:
{
"Default"
:
"server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
,
"ReadOnly"
:
"server=10.0.8.
15
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
"ReadOnly"
:
"server=10.0.8.
21
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
},
"PPSSkuStatus"
:
"http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus"
,
"ApiLogisticsGetFilterLogisticsAssignLine"
:
"http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine"
,
...
...
ResetOutofstock/appsettings.prod.json
View file @
310a7735
{
"ConnectionStrings"
:
{
"Default"
:
"server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
,
"ReadOnly"
:
"server=10.0.8.
15
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
"ReadOnly"
:
"server=10.0.8.
21
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
},
"PPS_ShortagePush"
:
"http://10.0.6.8:8002/api/EbayTask/PushSkuEditQtyTask"
,
"redis"
:
{
...
...
ShortagePush/appsettings.prod.json
View file @
310a7735
{
"ConnectionStrings"
:
{
"Default"
:
"server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
,
"ReadOnly"
:
"server=10.0.8.
15
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
"ReadOnly"
:
"server=10.0.8.
21
;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;"
},
"PPS_ShortagePush"
:
"http://10.0.6.8:8002/api/EbayTask/PushSkuEditQtyTask"
,
"PPS_ShortagePush2"
:
"http://10.0.0.27:5051/skutask/pushskueditqtytask"
,
...
...
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