diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 813fd100..6233a0fc 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -120,6 +120,13 @@ namespace WMS.Web.Domain.Services { TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); + + foreach (var prof in profitList) + { + prof.SerialNumbers.AddRange(prof.TwoSerialNumbers); + prof.SerialNumbers.Sort(); + } + takeStock.Details = _mapper.Map>(profitList); var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); @@ -129,6 +136,7 @@ namespace WMS.Web.Domain.Services d.OrgCode = subStock?.ErpOrgCode; //d.StockCode = subStock?.StockCode; //d.SubStockCode = subStock?.Code; + if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode)) return Result.ReFailure(ResultCodes.TakeStockErpSubStockError); } @@ -139,6 +147,11 @@ namespace WMS.Web.Domain.Services } if (lossList.Count() > 0) { + foreach (var loss in lossList) + { + loss.SerialNumbers.AddRange(loss.TwoSerialNumbers); + loss.SerialNumbers.Sort(); + } TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Details = _mapper.Map>(lossList); @@ -407,7 +420,7 @@ namespace WMS.Web.Domain.Services - var TwosNs = dto.SelectMany(s => s.TwoSerialNumbers).ToList(); + var TwosNs = dto.SelectMany(s => s.TwoSerialNumbers).ToList(); var TwoentityList = await _serialNumberRepositories.GetEntityList(TwosNs); foreach (var s in TwosNs) {