From 02ba5894227a0d3d051bdadba77f2f7e4267a057 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Mon, 23 Jun 2025 11:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279149 -> 279172 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 20 ++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 64 ++++++++++++ .../ProductInventoryQueryResponse.cs | 18 ++++ .../Public/IErpBasicDataExtendService.cs | 34 +++++++ .../Public/ErpBasicDataExtendService.cs | 94 ++++++++++++++++++ .../ProductInventoryRepositories.cs | 8 +- 7 files changed, 237 insertions(+), 1 deletion(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index e7f3f83ea2b436224233acfe78eeb501d813b98a..ec1e46859883f75e5010d9a5a7918469cf4c14b9 100644 GIT binary patch delta 18995 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 IfBew@2gZRY82|tP delta 18979 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 + + + 产品线(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();