diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index b04d5435..66e25ad2 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2611,6 +2611,21 @@
物料ID
+
+
+ 物料名称
+
+
+
+
+ 物料编码
+
+
+
+
+ 物料规格型号
+
+
序列号集
diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
index f1592dc7..962313c6 100644
--- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
@@ -67,6 +67,19 @@ namespace WMS.Web.Core.Dto.Inventory
///
public int MaterialId { get; set; }
+ ///
+ /// 物料名称
+ ///
+ public string MaterialName { get; set; }
+ ///
+ /// 物料编码
+ ///
+ public string MaterialNumber { get; set; }
+ ///
+ /// 物料规格型号
+ ///
+ public string Specifications { get; set; }
+
///
/// 序列号集
///
diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
index 36fa049f..b9ec0f33 100644
--- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
@@ -1276,7 +1276,10 @@ namespace WMS.Web.Domain.Services
return Result.ReSuccess();
}
- //private async Task ExeTaskBox(List serNubs,bool isTransaction) { }
+ //private async Task ExeTaskBox(List serNubs,bool isTransaction)
+ //{
+
+ //}
///
/// 入库单-箱库存变更
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 4c0d3787..80551dda 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -122,7 +122,11 @@ namespace WMS.Web.Repositories
///
public async Task GetInfoBy(string boxBillNo)
{
-
+ //1.获取物料集合和组织集合
+ var materials_result = await _erpService.BillQueryForMaterial();
+ if (!materials_result.IsSuccess)
+ return null;
+ var materials = materials_result.Data.ToList();
var entity=await _context.BoxInventory.Include(x=>x.Details)
.GroupJoin(_context.Box, t => t.BoxId, box => box.Id, (boxinvent, ts) => new { boxinvent, ts })
@@ -137,7 +141,12 @@ namespace WMS.Web.Repositories
response.Details = _mapper.Map>(entity.Details);
response.TotalQty = response.Details.Sum(x=>x.Qty);
}
-
+ response.Details.ForEach(x =>
+ {
+ x.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, x.MaterialId);
+ x.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, x.MaterialId);
+ x.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.MaterialId);
+ });
return response;
}