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-29 15:02:13 +08:00
parent f9db2c1b32
commit a68436cee6
4 changed files with 38 additions and 21 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

@@ -3152,6 +3152,11 @@
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.SubStockId">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.MaterialNumber">
<summary>
物料编码

5
src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryRequest.cs
View File

@@ -14,6 +14,11 @@ namespace WMS.Web.Core.Dto.Inventory
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// </summary>
public int? SubStockId { get; set; }
/// <summary>
/// 物料编码
///</summary>

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

@@ -647,21 +647,33 @@ namespace WMS.Web.Domain.Services
var tagBox = targetBoxInventorys.Where(x => x.BoxId == dto.TargetBoxId).FirstOrDefault();
if (tagBox != null)
{
var subStockId = tagBox.SubStockId;
var stockCode = tagBox.StockCode;
var orgCode = tagBox.OrgCode;
var tag_update_entity = tagBox;
//2.2.1这里为了重新上架，改变仓库和仓位的需求
if (!string.IsNullOrEmpty(dto.StockCode) && dto.SubStockId.HasValue)
{
//2.2.3.在变更目标箱的-仓库-仓位-组织
tag_update_entity.StockCode = dto.StockCode;
tag_update_entity.SubStockId = dto.SubStockId.Value;
tag_update_entity.OrgCode = dto.TargetBoxOrgCode;
}
tag_update_entity.Details = tagBox.Details;
//2.2.2仓位和原来的目标箱的仓位不一致的情况下-》》把目标箱原来仓位的物料进行-即时库存的变更-（减库存）
if (dto.SubStockId.Value != tag_update_entity.SubStockId)
if (subStockId != tag_update_entity.SubStockId)
{
foreach (var item in tag_update_entity.Details)
{
//2.2.2组装即时库存dto
var inventoryDet = new InventoryDetailsGenerateDto();
inventoryDet.MaterialId = item.MaterialId;
inventoryDet.OrgCode = tag_update_entity.OrgCode;
inventoryDet.StockCode = tag_update_entity.StockCode;
inventoryDet.SubStockId = tag_update_entity.SubStockId;
inventoryDet.OrgCode = orgCode;
inventoryDet.StockCode = stockCode;
inventoryDet.SubStockId = subStockId;
inventoryDet.Qty = item.Qty;
inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out;
//2.2.2即时库存：修改箱库存的集合
@@ -669,14 +681,6 @@ namespace WMS.Web.Domain.Services
}
}
//2.2.3.在变更目标箱的-仓库-仓位-组织
tag_update_entity.StockCode = dto.StockCode;
tag_update_entity.SubStockId = dto.SubStockId.Value;
tag_update_entity.OrgCode = dto.TargetBoxOrgCode;
}
tag_update_entity.Details = tagBox.Details;
//2.2.1遍历改变的明细
foreach (var item in dto.Details)
{

3
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -92,6 +92,9 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.StockCode == splitStrs[0] && w.OrgCode == splitStrs[1]);
}
if (dto.SubStockId.HasValue)
query = query.Where(w => w.SubStockId == dto.SubStockId.Value);
if (dto.Qty.HasValue)
query = query.Where(w => w.Qty == dto.Qty);