Commit b41bc649 by guanzhenshan

修复导出退款明细会把其他公司的数据导出的问题

parent 5bd7a689
......@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPurchaseSellStock
//{
// var _services = new Services();
// var start = DateTime.Parse("2019-10-28");
// var start = DateTime.Parse("2019-10-29");
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start);
......
......@@ -182,7 +182,7 @@ namespace Bailun.DC.DailyPurchaseSellStock
list.Add(m);
}
cn.Execute($"delete from dc_daily_purchase_sell_stock where record_time='{day.ToString("yyyy-MM-dd")}'");
cn.Execute($"delete from dc_daily_purchase_sell_stock where record_time='{day.ToString("yyyy-MM-dd")}'",null,null,2*60);
sql = "insert dc_daily_purchase_sell_stock (bailun_sku,warehouse_code,warehouse_name,createtime,record_time,end_onway_amount,end_onway_count,end_stock_amount,end_stock_count,start_onway_amount,start_onway_count,start_stock_amount,start_stock_count) values ";
var resultcount = 0;
......@@ -196,13 +196,14 @@ namespace Bailun.DC.DailyPurchaseSellStock
{
s += $"('{item.bailun_sku}','{item.warehouse_code}','{item.warehouse_name}','{item.createtime.ToString("yyyy-MM-dd HH:mm:ss")}','{item.record_time.ToString("yyyy-MM-dd")}',{item.end_onway_amount},{item.end_onway_count},{item.end_stock_amount},{item.end_stock_count},{item.start_onway_amount},{item.start_onway_count},{item.start_stock_amount},{item.start_stock_count}),";
}
resultcount += 5000;
resultcount += temp1.Count();
Console.WriteLine("保存" + resultcount + "记录," + DateTime.Now);
if (s.Length>0)
{
cn.Execute(sql + s.Substring(0, s.Length - 1), null, null, 2 * 60);
}
}
}
......
......@@ -4416,7 +4416,7 @@ namespace Bailun.DC.Services
sql += ") t2 on t1.origin_order_id=t2.origin_order_id";
}
sql += " where t1.is_deleted=0 and t1.is_freeze=0 ";
sql += " where t1.is_deleted=0 and t1.is_freeze=0 and t1.company_id=" + companyid.Value;
if (start.HasValue)
{
......
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