diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs index 3e331098e..300f6dba1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs @@ -107,10 +107,11 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager public async Task> GetListByToPackingCode(List toPackingCodeList) { List ret = new List(); + List lst = await _repository.GetListAsync( itm => toPackingCodeList.Contains(itm.ToPackingCode) - && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false); - + ).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox + //按to箱码分组,取最后一条记录 foreach (string toCode in toPackingCodeList) { var obj = lst.Where(itm => itm.ToPackingCode == toCode) @@ -152,9 +153,10 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager public async Task> GetListByFromPackingCode(List fromPackingCodeList) { List ret = new List(); + List lst = await _repository.GetListAsync( itm => fromPackingCodeList.Contains(itm.FromPackingCode) - && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false); + ).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox foreach (string fromCode in fromPackingCodeList) { @@ -174,11 +176,14 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager /// public async Task GetTopPackingCode(string packingCode) { - SplitPackingRec entity = new SplitPackingRec(); - SplitPackingRec item = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false); - if (item != null) + SplitPackingRec entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false); + if (entity == null) { entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.Other).ConfigureAwait(false); + if (entity == null) + { + entity = new SplitPackingRec(); + } } return entity; }