|
|
@@ -477,7 +477,6 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services |
|
|
|
var s = sf[i].AsQueryable().ToList().GroupBy(x => x.DeviceId).ToList(); |
|
|
|
for (int t = 0; t < s.Count; t++) |
|
|
|
{ |
|
|
|
var ss = s[t].AsQueryable(); |
|
|
|
GoodsTechnologyActionListView item = new() |
|
|
|
{ |
|
|
|
DeviceId = s[t].Key, |
|
|
@@ -485,7 +484,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services |
|
|
|
GoodsAttributeId = string.Join(',', sdw), |
|
|
|
DeviceName = Devicelist?.FirstOrDefault(x => x.Id == s[t].Key)?.DeviceName + "-" + goodlist?.FirstOrDefault(x => x.Id == dto.GoodsId)?.Name + "【" + nane + "】", |
|
|
|
Order = s[t].AsQueryable().First().Order, |
|
|
|
Data = s[t].AsQueryable().OrderBy(t=>t.Sort).ToList(), |
|
|
|
Data = s[t].AsQueryable().OrderBy(t => t.Sort).ToList(), |
|
|
|
}; |
|
|
|
result.Add(item); |
|
|
|
} |
|
|
|