Commit dcf2fffd by 泽锋 李

fix

parent dd374b27
......@@ -551,18 +551,19 @@ namespace AutoTurnOver.Services
/// </summary>
public List<dc_return_goods_push> ReturnGoodsPushFilter(List<dc_return_goods_push> datas)
{
var new_datas = datas.ToJson().ToObj<List<dc_return_goods_push>>();
// 规则一
var not_push_list = db_config.ReturnGoodsList(datas.Select(s=>s.bailun_sku).ToList());
if(not_push_list!=null && not_push_list.Count >= 1)
{
datas = datas.Where(s => !not_push_list.Any(p=>p.bailun_sku==s.bailun_sku && p.warehouse_code==s.warehouse_code)).ToList();
new_datas = new_datas.Where(s => !not_push_list.Any(p=>p.bailun_sku==s.bailun_sku && p.warehouse_code==s.warehouse_code)).ToList();
}
// 规则二
var buyers = new List<string> { "张莹霞", "张莹霞1", "黄静洁" };
var warehouse_codes = new List<string> { "BLGBPX" };
return datas.Where(s => !(buyers.Any(v=>s.buyer_name==v) && warehouse_codes.Any(v => s.warehouse_code == v))).ToList();
return new_datas.Where(s => !(buyers.Any(v=>s.buyer_name==v) && warehouse_codes.Any(v => s.warehouse_code == v))).ToList();
}
public List<dynamic> GetSkuWebsiteSales(bailun_sku_website_sales_search_dto search_data)
......
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