From 2c4f9cdbd8a5fcf76d2c1b7b6f4b3beeb0535075 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 4 Jan 2024 16:33:22 +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 .../Services/TakeStockService.cs | 14 ++++++++++---- .../TakeStockRepositories.cs | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 1e56312df3f755819828572ce39cdcc6d9210298..be76f93a3002419980134dcea4096973e0651ba0 100644 GIT binary patch delta 22394 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 pN Save(List dto, LoginInDto loginInfo) { _logger.LogInformation($"盘点保存:{JsonConvert.SerializeObject(dto)} 盘点人:{loginInfo.UserInfo.StaffId}"); - dto = dto.Where(w => w.AfterQty != w.BeforeQty).ToList(); + //dto = dto.Where(w => w.AfterQty != w.BeforeQty).ToList(); if (dto.Count() == 0) return Result.ReSuccess(); if (dto.GroupBy(g => g.BoxId).Count() > 1) return Result.ReFailure(ResultCodes.TakeStockBoxError); @@ -199,14 +199,20 @@ namespace WMS.Web.Domain.Services var sc_erpBasicDataExtendService = scope.ServiceProvider.GetRequiredService(); var sc_takeStockRepositories = scope.ServiceProvider.GetRequiredService(); - if (entity.Details.Count() == 0) return Result.ReSuccess(); + var details = entity.Details.Where(w => w.FinalQty > 0).ToList(); + if (details.Count() == 0) + { + entity.Sync(true, "", SyncStatus.Success, ""); + await sc_takeStockRepositories.Edit(entity, true); + return Result.ReSuccess(); + } var materials_result = await sc_erpService.BillQueryForMaterial(); if (!materials_result.IsSuccess) return Result.ReFailure(ResultCodes.ErpMaterialError); var materials = materials_result.Data.ToList(); var subs = await _erpService.BillQueryForSubStock(); List<(string materialNumber, string orgCode, string stockCode, int subStockId)> requestInventory = new List<(string materialNumber, string orgCode, string stockCode, int subStockId)>(); - foreach (var d in entity.Details) + foreach (var d in details) { int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0; requestInventory.Add((_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId), d.OrgCode, d.StockCode, subStockId)); @@ -223,7 +229,7 @@ namespace WMS.Web.Domain.Services #region 组装dto //子仓库 ORICO_JD:1000008 GD:1000005 HD:1000007 AD:1000004 List detils = new List(); - foreach (var d in entity.Details) + foreach (var d in details) { int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0; var number = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId); diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index c1bf79cd..724eab14 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -217,7 +217,7 @@ namespace WMS.Web.Repositories .GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .OrderByDescending(o => o.detail.Id) - .Where(adv => 1 == 1); + .Where(adv => 1 == 1 && adv.detail.FinalQty > 0); if (!string.IsNullOrEmpty(dto.MaterialNumber)) query = query.Where(w => mIds.Contains(w.detail.MaterialId));