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

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2441,11 +2441,6 @@
类型：1为入库，2为出库 类型：1为入库，2为出库
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto.InventoryInOutMethod">
<summary>
出入库存-方式(详情见枚举值)：必填；1-box按箱，2-product按产品
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto.BoxId"> <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto.BoxId">
<summary> <summary>
箱ID 箱ID

8
src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs
View File

@@ -14,10 +14,10 @@ namespace WMS.Web.Core.Dto.Inventory
/// </summary> /// </summary>
public int InventoryInOutType { get; set; } public int InventoryInOutType { get; set; }
/// <summary> ///// <summary>
/// 出入库存-方式(详情见枚举值)：必填；1-box按箱，2-product按产品 ///// 出入库存-方式(详情见枚举值)：必填；1-box按箱，2-product按产品-------弃用
/// </summary> ///// </summary>
public int InventoryInOutMethod { get; set; } //public int InventoryInOutMethod { get; set; }
/// <summary> /// <summary>
/// 箱ID /// 箱ID

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

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