diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b067329d..a792b8e0 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 132599be..3e509dee 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4234,6 +4234,11 @@ wms箱ID + + + 是否为不计算 + + 页码 diff --git a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs index 348fce1b..f02ceddc 100644 --- a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs @@ -22,5 +22,9 @@ namespace WMS.Web.Core.Dto.Inventory /// wms箱ID /// public int BoxId { get; set; } + /// + /// 是否为不计算 + /// + public string isNotCount { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index efb32cb3..e66019cc 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -1545,9 +1545,17 @@ namespace WMS.Web.Domain.Services item.Details.ForEach(x => { var current_sers_info = out_SerialNumbers.Where(o => o.BoxId == item.BoxId && o.MaterialNumber == x.MaterialNumber).ToList(); + var current_sers_infoCount = out_SerialNumbers.Where(o => o.BoxId == item.BoxId && o.MaterialNumber == x.MaterialNumber && o.isNotCount!="1").ToList(); if (current_sers_info != null && current_sers_info.Count != 0) { - x.Qty = x.Qty - current_sers_info.Count; + //if (isNoCount == "1") + //{ + + //} + //else + //{ + x.Qty = x.Qty - current_sers_infoCount.Count; + //} var crrent_sers = current_sers_info.Select(t => t.SerialNumber).ToList(); x.SerialNumbers.RemoveAll(r => crrent_sers.Contains(r)); diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 6233a0fc..4c6b30f8 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -413,7 +413,9 @@ namespace WMS.Web.Domain.Services { BoxId = entity.BoxId, MaterialNumber = d.MaterialNumber, - SerialNumber = s + SerialNumber = s, + isNotCount="0" + }); } } @@ -433,7 +435,9 @@ namespace WMS.Web.Domain.Services { BoxId = entity.BoxId, MaterialNumber = d.MaterialNumber, - SerialNumber = s + SerialNumber = s, + isNotCount="1" + }); } } diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 058a6f21..1b279245 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -163,11 +163,13 @@ namespace WMS.Web.Repositories public async Task> GetEntityList(List serialNumbers) { var res = await _context.SerialNumbers + // .Where(f => serialNumbers.Contains(f.SerialNumber)) .Where(f => serialNumbers.Contains(f.SerialNumber)) .ToListAsync(); var res_c = res.Clone(); - var s_e = res.Select(s => s.SerialNumber).ToList(); + //var s_e = res.Select(s => s.SerialNumber).ToList(); + var s_e = res.Select(s => s.TwoSerialNumber).ToList(); //在序列表里没找到的序列码 则到老ops序列码数据里去处理 list比较 取差集 var s_c = serialNumbers.Except(s_e); if (s_c.Count() > 0)