Commit 310a7735 by 泽锋 李

fix

parent b6491ca5
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;", "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", "PushBuyPlan": "http://api.purchase.bailuntec.com/api/CreatePlanToPurchase",
"QiNiu": { "QiNiu": {
......
...@@ -467,7 +467,6 @@ where ( t_db.hq_type!='国内仓' or t2.buyer_name not in ('张莹霞','张莹 ...@@ -467,7 +467,6 @@ where ( t_db.hq_type!='国内仓' or t2.buyer_name not in ('张莹霞','张莹
} }
else else
{ {
var conn = _connection;
var shortage_list = new List<dc_auto_shortage_push>(); var shortage_list = new List<dc_auto_shortage_push>();
// 缺货推送 // 缺货推送
string sql = @"select string sql = @"select
...@@ -532,7 +531,7 @@ and not exists ( select * from dc_auto_shortage_push_not_config where dc_auto_sh ...@@ -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') ) "; sql += " and !(t2.develop_time>='2020-10-01' and t2.buyer_name not in ('张莹霞','赵美聪','甄杰靖','张莹霞') and t1.warehouse_code in ('GZBLWH') ) ";
} }
} }
shortage_list.AddRange(conn.Query<dc_auto_shortage_push>(sql, new { platform = platform }, commandTimeout: 0)); shortage_list.AddRange(_connection.Query<dc_auto_shortage_push>(sql, new { platform = platform }, commandTimeout: 0));
// 0库存推送 // 0库存推送
string no_library_sql = @" select t1.bailun_sku, string no_library_sql = @" select t1.bailun_sku,
...@@ -1103,7 +1102,6 @@ end ...@@ -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> 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"}; List<string> ch_rule1 = new List<string>(){ "GZBLWH", "BLGZ03"};
var conn = _connection;
var shortage_list = new List<dc_return_goods_push>(); var shortage_list = new List<dc_return_goods_push>();
// 回货速改推送 // 回货速改推送
string sql = @"select string sql = @"select
...@@ -1154,7 +1152,6 @@ left join holiday_supplier_view as t_sp on t2.suppliers_id = t_sp.supplier_id ...@@ -1154,7 +1152,6 @@ left join holiday_supplier_view as t_sp on t2.suppliers_id = t_sp.supplier_id
where where
t_sp.supplier_id is null and t_sp.supplier_id is null and
t1.platform=@platform 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 and
( (
case case
...@@ -1165,7 +1162,15 @@ end ...@@ -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; return shortage_list;
......
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;", "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", "PPSSkuStatus": "http://pps.bailuntec.com/Api/Centre/Publish/External/SkuStatus",
"ApiLogisticsGetFilterLogisticsAssignLine": "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine", "ApiLogisticsGetFilterLogisticsAssignLine": "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogisticsAssignLine",
......
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;", "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_ShortagePush": "http://10.0.6.8:8002/api/EbayTask/PushSkuEditQtyTask",
"redis": { "redis": {
......
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "server=10.0.8.15;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;", "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_ShortagePush": "http://10.0.6.8:8002/api/EbayTask/PushSkuEditQtyTask",
"PPS_ShortagePush2": "http://10.0.0.27:5051/skutask/pushskueditqtytask", "PPS_ShortagePush2": "http://10.0.0.27:5051/skutask/pushskueditqtytask",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment