18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

Browse Source
This commit is contained in:
tongfei
2024-04-09 15:16:53 +08:00
parent beb0c8732a 55721d7630
commit 9a03233328
8 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -461,7 +461,9 @@ namespace WMS.Web.Domain.Services
foreach (var s in serialNumbers)
{
var takeStockDetail = takeStocks.SelectMany(s => s.Details).FirstOrDefault(w => w.SerialNumbers.Contains(s));
if (takeStockDetail == null) continue;
var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId);
var s_entity = entityList.FirstOrDefault(f => f.SerialNumber.Equals(s));
if (box != null && box.Details.FirstOrDefault(f => f.MaterialNumber == takeStockDetail.MaterialNumber) == null)
@@ -479,10 +481,11 @@ namespace WMS.Web.Domain.Services
}
else
{
s_entity.TakeStock(takeStockDetail.BoxId);
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
s_entity.TakeStock(takeStockDetail.BoxId, takeStock.ResultType);
if (s_entity.BoxId == takeStockDetail.BoxId) continue;
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
//记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate()
{