From 8216fafab96d25c29d452de40e3b4873b1c08639 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Sat, 25 Nov 2023 17:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BoxInventoryRepositories.cs | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index d6bdd4c7..9f9edf80 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -103,36 +103,19 @@ namespace WMS.Web.Repositories /// public async Task GetInfoBy(string boxBillNo) { - ////1.获取物料集合和组织集合 - //var materials_result = await _erpService.BillQueryForMaterial(); - //if (!materials_result.IsSuccess) - // return new List(); - //var materials = materials_result.Data.ToList(); + var entity=await _context.BoxInventory.Include(x=>x.Details) .GroupJoin(_context.Box, t => t.BoxId, box => box.Id, (boxinvent, ts) => new { boxinvent, ts }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.boxinvent, box }) .Where(x => 1 == 1 && x.box.BoxBillNo==boxBillNo).Select(x=>x.boxinvent).FirstOrDefaultAsync(); - - - var response = _mapper.Map(entity); if (response != null) { - //var serialNumbs = await _context.SerialNumbers.Where(x => x.BoxId == response.BoxId).ToListAsync(); - response.Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, response.StockCode + response.OrgCode); response.SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, response.SubStockId); response.Details = _mapper.Map>(entity.Details); - //if (response.Details != null && response.Details.Count != 0) - //{ - // response.Details.ForEach(x => - // { - // x.SerialNumbers = serialNumbs.Where(t => t.MaterialId == x.MaterialId).Select(t=>t.SerialNumber).ToList(); - // }); - //} - response.TotalQty = response.Details.Sum(x=>x.Qty); } @@ -156,7 +139,7 @@ namespace WMS.Web.Repositories /// public async Task Get(int id) { - return await _context.BoxInventory.Include(x => x.Details).Where(x => x.Id==id).FirstOrDefaultAsync(); + return await _context.BoxInventory.Include(x => x.Details).Where(x => x.BoxId== id).FirstOrDefaultAsync(); } ///