diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index e7f3f83e..ec1e4685 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 7cae496f..da86a849 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -6330,6 +6330,26 @@
库存量
+
+
+ 产品线(1级)
+
+
+
+
+ 产品分类(2级)
+
+
+
+
+ 产品分组(3级)
+
+
+
+
+ SPU
+
+
客户编码
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 3a8400db..ccb61871 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -4177,6 +4177,38 @@
+
+
+ 获取物料产品1级
+
+
+
+
+
+
+
+ 获取物料产品2级
+
+
+
+
+
+
+
+ 获取物料产品3级
+
+
+
+
+
+
+
+ 获取物料spu
+
+
+
+
+
获取物料规格型号
@@ -6115,6 +6147,38 @@
+
+
+ 获取物料产品线(1级)
+
+
+
+
+
+
+
+ 获取物料产品分类(2级)
+
+
+
+
+
+
+
+ 获取物料产品分组(3级)
+
+
+
+
+
+
+
+ 获取物料SPU
+
+
+
+
+
获取物料编码
diff --git a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
index ae55748d..bb9a6f26 100644
--- a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
@@ -65,5 +65,23 @@ namespace WMS.Web.Core.Dto.ProductInventory
///
[Column("库存量")]
public decimal BeforeQty { get; set; } = 0;
+ ///
+ /// 产品线(1级)
+ ///
+ public string FProductLines1FName { get; set; }
+ ///
+ /// 产品分类(2级)
+ ///
+ public string FProductCATs1FName { get; set; }
+ ///
+ /// 产品分组(3级)
+ ///
+ public string FMaterialGroupFName { get; set; }
+ ///
+ /// SPU
+ ///
+ public string F_Product { get; set; }
+
+
}
}
diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
index 512a46d9..9ca8d473 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
@@ -44,6 +44,40 @@ namespace WMS.Web.Domain.IService.Public
///
string GetMaterialName(List erpMaterials, string materialNumber);
+ ///
+ /// 获取物料产品1级
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFProductLines1FName(List erpMaterials, string materialNumber);
+ ///
+ /// 获取物料产品2级
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFProductCATs1FName(List erpMaterials, string materialNumber);
+
+ ///
+ /// 获取物料产品3级
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFMaterialGroupFName(List erpMaterials, string materialNumber);
+
+ ///
+ /// 获取物料spu
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialF_Product(List erpMaterials, string materialNumber);
+
+
+
+
///
/// 获取物料规格型号
///
diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
index a927b6d7..4eafc87f 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
@@ -120,6 +120,100 @@ namespace WMS.Web.Domain.Services.Public
}
return mat.MaterialName;
}
+
+
+ ///
+ /// 获取物料产品线(1级)
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFProductLines1FName(List erpMaterials, string materialNumber)
+ {
+ if (erpMaterials == null || erpMaterials.Count == 0)
+ return "";
+
+ var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+ if (mat == null)
+ {
+ var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+ if (!result.IsSuccess)
+ return "";
+ return result.Data == null ? "" : result.Data.FProductLines1FName;
+ }
+ return mat.FProductLines1FName;
+ }
+ ///
+ /// 获取物料产品分类(2级)
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFProductCATs1FName(List erpMaterials, string materialNumber)
+ {
+ if (erpMaterials == null || erpMaterials.Count == 0)
+ return "";
+
+ var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+ if (mat == null)
+ {
+ var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+ if (!result.IsSuccess)
+ return "";
+ return result.Data == null ? "" : result.Data.FProductCATs1FName;
+ }
+ return mat.FProductCATs1FName;
+ }
+
+ ///
+ /// 获取物料产品分组(3级)
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialFMaterialGroupFName(List erpMaterials, string materialNumber)
+ {
+ if (erpMaterials == null || erpMaterials.Count == 0)
+ return "";
+
+ var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+ if (mat == null)
+ {
+ var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+ if (!result.IsSuccess)
+ return "";
+ return result.Data == null ? "" : result.Data.FMaterialGroupFName;
+ }
+ return mat.FMaterialGroupFName;
+ }
+
+ ///
+ /// 获取物料SPU
+ ///
+ ///
+ ///
+ ///
+ public string GetMaterialF_Product(List erpMaterials, string materialNumber)
+ {
+ if (erpMaterials == null || erpMaterials.Count == 0)
+ return "";
+
+ var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+ if (mat == null)
+ {
+ var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+ if (!result.IsSuccess)
+ return "";
+ return result.Data == null ? "" : result.Data.F_Product;
+ }
+ return mat.F_Product;
+ }
+
+
///
/// 获取物料编码
///
diff --git a/src/WMS.Web.Repositories/ProductInventoryRepositories.cs b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs
index 673fd09b..1ae64f48 100644
--- a/src/WMS.Web.Repositories/ProductInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs
@@ -136,6 +136,7 @@ namespace WMS.Web.Repositories
#endregion
var query = _context.ProductInventory
+
.OrderByDescending(o => o.Id)
.Where(adv => 1 == 1 && (adv.Qty > 0 || adv.BeforeQty > 0));
@@ -169,7 +170,12 @@ namespace WMS.Web.Repositories
Batch = s.Batch,
Customer = s.Customer,
Qty = s.Qty,
- BeforeQty = s.BeforeQty
+ BeforeQty = s.BeforeQty,
+ FProductLines1FName=_erpBasicDataExtendService.GetMaterialFProductLines1FName(materials, s.MaterialNumber),
+ FProductCATs1FName = _erpBasicDataExtendService.GetMaterialFProductCATs1FName(materials, s.MaterialNumber),
+ FMaterialGroupFName = _erpBasicDataExtendService.GetMaterialFMaterialGroupFName(materials, s.MaterialNumber),
+ F_Product = _erpBasicDataExtendService.GetMaterialF_Product(materials, s.MaterialNumber),
+
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();