From 3a9092478d27969e8a8bb3f8cc709ac02de0f212 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 18 Jan 2024 09:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 232149 -> 232149 bytes .../OutStockTaskRepositories.cs | 32 ++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index a64527a04ac46242cd27d1ffaadfd8b29c633c01..913644d8ea05433b9a48331b9edc6ee1d46e809c 100644 GIT binary patch delta 23304 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 delta 22953 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�qYdXx_=&ck`z>9IUZD(p2%2-VY4^)S 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 diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 79d4cbaa..675bb9bf 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -339,13 +339,23 @@ namespace WMS.Web.Repositories var materials = materials_result.Data.ToList(); List ids = new List(); - - var list = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) - .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || - f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && + List list = new List(); + var list1 = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) + .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") && (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) .OrderByDescending(o => o.Id) .ToListAsync(); + if (list1 != null && list1.Count() > 0) + list.AddRange(list1); + + var list2 = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) + .Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) + .ToListAsync(); + if (list2 != null && list2.Count() > 0) + list.AddRange(list2); + var response = _mapper.Map>(list); foreach (var r in response) { @@ -448,13 +458,21 @@ namespace WMS.Web.Repositories public async Task> GetOutStockTaskNosByNo(string billNo) { - return await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) - .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || - f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && + var res = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) + .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") && (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) .OrderByDescending(o => o.Id) .Select(s => s.BillNo) .ToListAsync(); + + var ress = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails) + .Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) + .Select(s => s.BillNo) + .ToListAsync(); + res.AddRange(ress); + return res; } ///