修复bug
This commit is contained in:
@@ -56,7 +56,8 @@ namespace WMS.Web.Domain.Services
|
||||
{
|
||||
//数据库里已经存在箱信息 移除
|
||||
var box = list.FirstOrDefault(f => f.BoxBillNo.Equals(s));
|
||||
list.Remove(box);
|
||||
if (box != null)
|
||||
list.Remove(box);
|
||||
}
|
||||
var boxs = _mapper.Map<List<Box>>(list);
|
||||
|
||||
@@ -75,13 +76,14 @@ namespace WMS.Web.Domain.Services
|
||||
var ops_box = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId);
|
||||
foreach (var sn in ops_box.Details.SelectMany(s => s.SerialNumbers))
|
||||
{
|
||||
var detail = ops_box.Details.FirstOrDefault(f => f.SerialNumbers.Select(s=>s.SerialNumber).Equals(sn.SerialNumber));
|
||||
if (detail == null) continue;
|
||||
var detail = ops_box.Details.FirstOrDefault(f => f.SerialNumbers.Select(s => s.SerialNumber).Contains(sn.SerialNumber));
|
||||
if (detail == null)
|
||||
continue;
|
||||
var opsSerial = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId).Details
|
||||
.SelectMany(s => s.SerialNumbers)
|
||||
.FirstOrDefault(s => s.SerialNumber.Equals(sn.SerialNumber));
|
||||
//序列号
|
||||
SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialId,b.Id,b.OpsBoxId, opsSerial.BarCereateUser,opsSerial.BarCreateTime);
|
||||
SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialId, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime);
|
||||
sList.Add(s);
|
||||
//序列号记录(序列号生成)
|
||||
SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);
|
||||
|
||||
Reference in New Issue
Block a user