diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs index 24ef9f82..6986be71 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Newtonsoft.Json; +using SqlSugar; namespace Tnb.WarehouseMgr.Entities.Dto.Outputs { @@ -63,11 +65,11 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs /// 齐套明细输出 /// public List? CollocationSchemeDs { get; set; } - - public List list{ get; set; } + [JsonIgnore] + public List? list { get; set; } } - - public class CollocationSchemeDOutput + + public class CollocationSchemeDOutput { /// /// 主键ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs index 88f7cdc4..2ade7c92 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs @@ -94,13 +94,12 @@ namespace Tnb.WarehouseMgr try { results = await _db.Queryable() - .LeftJoin((a, b) => b.bill_id == a.id) .Where(a => a.material_id == input.material_id) - .Select((a, b) => new CollocationSchemeOutput + .Select(a => new CollocationSchemeOutput { list = SqlFunc.Subqueryable().Where(b => b.bill_id == a.id).ToList(), }, true) - .Mapper(it=> it.CollocationSchemeDs = it.list.Adapt>()) + .Mapper(it => it.CollocationSchemeDs = it.list?.Adapt>()) .ToListAsync(); } catch (Exception ex)