diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index dce3b923..073a9d53 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -6212,14 +6212,6 @@ - - - 获取物料规格型号 - - - - - 获取物料名称 diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs index cc8fa97e..416b953a 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs @@ -86,7 +86,6 @@ namespace WMS.Web.Domain.IService.Public /// string GetMaterialSpecifications(List erpMaterials, string materialNumber); - string Getuc_warehouse_position(List warehouse_position, string positionCode); /// /// 获取物料基本单位名称 diff --git a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs index 4f8fcd94..05b4e552 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs @@ -35,6 +35,8 @@ namespace WMS.Web.Domain.Infrastructure /// 查询实体集合 Task> Getuc_warehouse_position(); + string Getuc_warehouse_position(List warehouse_position, string positionCode); + Task> GetEntityListByNos(List billNos); } diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index 202dc9a4..fefc8a96 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -99,23 +99,7 @@ namespace WMS.Web.Domain.Services.Public } - /// - /// 获取物料规格型号 - /// - /// - /// - /// - public string Getuc_warehouse_position(List warehouse_position, string positionCode) - { - if (warehouse_position == null || warehouse_position.Count == 0) - return ""; - var mat = warehouse_position.Where(x => x.position_code == positionCode).FirstOrDefault(); - if (mat == null) - { - return ""; - } - return mat.position; - } + /// /// 获取物料名称 diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index 7bf2249c..17839472 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -225,6 +225,23 @@ namespace WMS.Web.Repositories return res.Clone(); } + /// + /// 获取仓位 + /// + /// + /// + /// + public string Getuc_warehouse_position(List warehouse_position, string positionCode) + { + if (warehouse_position == null || warehouse_position.Count == 0) + return ""; + var mat = warehouse_position.Where(x => x.position_code == positionCode).FirstOrDefault(); + if (mat == null) + { + return ""; + } + return mat.position; + } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 3fd985ad..9511f7a7 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -143,7 +143,7 @@ namespace WMS.Web.Repositories //取仓位 - var positions = new List(); + //var positions = new List(); var postionList = await _boxRepositories.Getuc_warehouse_position(); //positions = postionList @@ -207,9 +207,9 @@ namespace WMS.Web.Repositories RealityQty = x.detail.Qty, ReceiveQty = x.detail.Qty, ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), - shelfSpaceCode= _erpBasicDataExtendService.Getuc_warehouse_position(positions, x.order.SubStockCode), + shelfSpaceCode= x.order.SubStockCode, - shelfSpace = x.order.SubStockCode, + shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode), Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId), Receiver = "", ReceiveTime = "",