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

回退上架-箱库存优化

Browse Source
This commit is contained in:
tongfei
2023-12-18 14:02:55 +08:00
parent 4258f96205
commit dba406e0e0
3 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/WMS.Web.Domain/Services/BoxInventoryService.cs
View File

@@ -233,7 +233,7 @@ namespace WMS.Web.Domain.Services
OrgCode = dtoData.OrgCode,
StockCode = dtoData.StockCode,
SubStockId = dtoData.SubStockId,
InventoryInOutMethod = (int)dtoData.Method,
//InventoryInOutMethod = (int)dtoData.Method,
InventoryInOutType = dtoData.Type == BackRecordType.OutstockOn ? (int)InventoryInOutType.In : (int)InventoryInOutType.Out
}).ToList();
@@ -922,27 +922,27 @@ namespace WMS.Web.Domain.Services
addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
#region 序列号处理
if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
/////按箱的-弃用了
//if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
//{
// //当前箱的序列号
// var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
// //赋值序列号
// addEntity.Details.ForEach(x =>
// {
// var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
// x.SerialNumbers.AddRange(current_box_mat_serNums);
// });
//}
//赋值序列号
addEntity.Details.ForEach(x =>
{
//当前箱的序列号
var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
//赋值序列号
addEntity.Details.ForEach(x =>
{
var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
x.SerialNumbers.AddRange(current_box_mat_serNums);
});
}
else
{
//赋值序列号
addEntity.Details.ForEach(x =>
{
var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
});
}
var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
});
#endregion
add_entitys.Add(addEntity);
}
@@ -970,27 +970,27 @@ namespace WMS.Web.Domain.Services
}
#region 序列号处理
if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
/////按箱的-弃用了
//if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
//{
// //当前箱的序列号
// var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
// //赋值序列号
// update_entity.Details.ForEach(x =>
// {
// var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
// x.SerialNumbers.AddRange(current_box_mat_serNums);
// });
//}
//赋值序列号
update_entity.Details.ForEach(x =>
{
//当前箱的序列号
var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
//赋值序列号
update_entity.Details.ForEach(x =>
{
var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
x.SerialNumbers.AddRange(current_box_mat_serNums);
});
}
else
{
//赋值序列号
update_entity.Details.ForEach(x =>
{
var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
});
}
var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
});
#endregion
update_entitys.Add(update_entity);