diff --git a/BPA.SAAS.Manage.Application/DataBase/Dtos/GoodsTechnology/GoodsTechnologyActionListView.cs b/BPA.SAAS.Manage.Application/DataBase/Dtos/GoodsTechnology/GoodsTechnologyActionListView.cs index e63c069..0e8eb37 100644 --- a/BPA.SAAS.Manage.Application/DataBase/Dtos/GoodsTechnology/GoodsTechnologyActionListView.cs +++ b/BPA.SAAS.Manage.Application/DataBase/Dtos/GoodsTechnology/GoodsTechnologyActionListView.cs @@ -10,6 +10,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Dtos.GoodsTechnology { public string DeviceId { get; set; } public string WarehousrTemplateId { get; set; } + public string GoodsAttributeId { get; set; } public string DeviceName { get; set; } public List Data { get; set; } } diff --git a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTechnologyService.cs b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTechnologyService.cs index b1b1dea..f9daf7f 100644 --- a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTechnologyService.cs +++ b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTechnologyService.cs @@ -130,6 +130,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services 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 sdw = GoodsAttributeValue?.Where(x => sf[i].Key.Contains(x.Id)).Select(x => x.Id).ToArray(); var nane =string.Join('-', sd); var s = sf[i].AsQueryable().ToList().GroupBy(x => x.DeviceId).ToList(); for (int t = 0; t < s.Count; t++) @@ -138,6 +139,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services { DeviceId = s[t].Key, WarehousrTemplateId = sf1[t].Key, + GoodsAttributeId = string.Join(',', sdw), DeviceName = Devicelist?.FirstOrDefault(x => x.Id == s[t].Key).DeviceName+ "【"+ nane+"】", Data = s[t].AsQueryable().ToList(), };