|
@@ -130,6 +130,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services |
|
|
for (int i = 0; i < sf.Count; i++) |
|
|
for (int i = 0; i < sf.Count; i++) |
|
|
{ |
|
|
{ |
|
|
var sd = GoodsAttributeValue?.Where(x => sf[i].Key.Contains(x.Id)).Select(x => x.AttributeValue).ToArray(); |
|
|
var sd = GoodsAttributeValue?.Where(x => sf[i].Key.Contains(x.Id)).Select(x => x.AttributeValue).ToArray(); |
|
|
|
|
|
var sdw = GoodsAttributeValue?.Where(x => sf[i].Key.Contains(x.Id)).Select(x => x.Id).ToArray(); |
|
|
var nane =string.Join('-', sd); |
|
|
var nane =string.Join('-', sd); |
|
|
var s = sf[i].AsQueryable().ToList().GroupBy(x => x.DeviceId).ToList(); |
|
|
var s = sf[i].AsQueryable().ToList().GroupBy(x => x.DeviceId).ToList(); |
|
|
for (int t = 0; t < s.Count; t++) |
|
|
for (int t = 0; t < s.Count; t++) |
|
@@ -138,6 +139,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services |
|
|
{ |
|
|
{ |
|
|
DeviceId = s[t].Key, |
|
|
DeviceId = s[t].Key, |
|
|
WarehousrTemplateId = sf1[t].Key, |
|
|
WarehousrTemplateId = sf1[t].Key, |
|
|
|
|
|
GoodsAttributeId = string.Join(',', sdw), |
|
|
DeviceName = Devicelist?.FirstOrDefault(x => x.Id == s[t].Key).DeviceName+ "【"+ nane+"】", |
|
|
DeviceName = Devicelist?.FirstOrDefault(x => x.Id == s[t].Key).DeviceName+ "【"+ nane+"】", |
|
|
Data = s[t].AsQueryable().ToList(), |
|
|
Data = s[t].AsQueryable().ToList(), |
|
|
}; |
|
|
}; |
|
|