修复bug
This commit is contained in:
@@ -180,6 +180,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
var serialNumbers = outStock.Details.SelectMany(s => s.SerialNumbers).ToList();
|
var serialNumbers = outStock.Details.SelectMany(s => s.SerialNumbers).ToList();
|
||||||
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
|
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
|
||||||
var boxIds = entityList.Select(s => s.BoxId).ToList();
|
var boxIds = entityList.Select(s => s.BoxId).ToList();
|
||||||
|
boxIds.AddRange(outStock.Details.SelectMany(s => s.BoxsDetails).Select(s => s.BoxId));
|
||||||
var boxList = await _boxRepositories.GetEntityList(boxIds);
|
var boxList = await _boxRepositories.GetEntityList(boxIds);
|
||||||
var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
|
var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
|
||||||
|
|
||||||
@@ -191,7 +192,8 @@ namespace WMS.Web.Domain.Services
|
|||||||
List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
|
List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
|
||||||
foreach (var entity in entityList)
|
foreach (var entity in entityList)
|
||||||
{
|
{
|
||||||
var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
|
var boxId = outStock.Details.SelectMany(s => s.BoxsDetails).FirstOrDefault(w => w.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
|
||||||
|
var box = boxList.FirstOrDefault(f => f.Id == boxId);
|
||||||
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
|
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
|
||||||
if (outstockDetail == null) continue;
|
if (outstockDetail == null) continue;
|
||||||
//修改序列号和箱绑定关系
|
//修改序列号和箱绑定关系
|
||||||
@@ -202,8 +204,8 @@ namespace WMS.Web.Domain.Services
|
|||||||
{
|
{
|
||||||
MaterialNumber = entity.MaterialNumber,
|
MaterialNumber = entity.MaterialNumber,
|
||||||
SerialNumber = entity.SerialNumber,
|
SerialNumber = entity.SerialNumber,
|
||||||
OrgId = box.OrgId,
|
OrgId = box?.OrgId ?? 0,
|
||||||
SupplierId = box.SupplierId,
|
SupplierId = box?.SupplierId ?? 0,
|
||||||
OperateTime = DateTime.Now,
|
OperateTime = DateTime.Now,
|
||||||
OperateType = OutStockTypeConvert(outStock.Type),
|
OperateType = OutStockTypeConvert(outStock.Type),
|
||||||
OperateUser = userName,
|
OperateUser = userName,
|
||||||
|
|||||||
Reference in New Issue
Block a user