Commit 62534272 by lizefeng

fix

parent 240c46b1
......@@ -365,9 +365,11 @@ namespace AutoTurnOver.DB
var viewDatas = new List<deviation_view_dto>() { };
var year = DateTime.Now.Year;
var allDatas = datas.GroupBy(s => new { s.sku, s.project, s.field, s.field_type }).OrderBy(s => s.Key.field_type);
var allDatas = datas.GroupBy(s => new { s.sku, s.project,s.field_type,s.field }).OrderBy(s => s.Key.field_type);
foreach (var item in allDatas.Take(limit).Skip(offset))
{
foreach (var itemField in enumList)
{
deviation_view_dto itemData = new deviation_view_dto()
{
field = item.Key.field,
......@@ -391,6 +393,8 @@ namespace AutoTurnOver.DB
viewDatas.Add(itemData);
}
}
total = allDatas.Count();
......@@ -402,7 +406,7 @@ namespace AutoTurnOver.DB
var data = list.FirstOrDefault(s => date_str == s.date_str);
if (data == null)
{
return null;
return 0;
}
else
{
......@@ -429,7 +433,7 @@ namespace AutoTurnOver.DB
sql += " and t1.sku=@sku ";
parameters.Add("sku", search_data.sku);
}
return _connection.Query<dc_ana_deviation>(sql, parameters, commandTimeout: 0).ToList();
return MyMySqlConnection._connection_read_only.Query<dc_ana_deviation>(sql, parameters, commandTimeout: 0).ToList();
}
public async static Task<decimal> GetOmsSale(DateTime btime, DateTime etime, List<dc_ana_deviation_sku> anaSkus)
......
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