diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 3f472755..5040b803 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -2,7 +2,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -17,6 +19,7 @@ using WMS.Web.Core.Dto.SingleData; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Options; using WMS.Web.Domain.Values; using WMS.Web.Domain.Values.Single; @@ -41,13 +44,17 @@ namespace WMS.Web.Api.Controllers private readonly IOutStockRepositories _outStockRepositories; private readonly IMoveBoxRecordRepositories _moveBoxRecordRepositories; private readonly ILogger _logger; + private ErpOptions _erpOptions; + private readonly IMemoryCache _memoryCache; - public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories, - IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService, + public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories, IOptions erpOptions, + IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService, IMemoryCache memoryCache, ISerialNumbersRepositories serialNumbersRepositories, IBoxInventoryRepositories boxInventoryRepositories, IMapper mapper, IErpBasicDataExtendService erpBasicDataExtendService, IOutStockRepositories outStockRepositories, ILogger logger, IMoveBoxRecordRepositories moveBoxRecordRepositories) { + this._erpOptions = erpOptions?.Value; + this._memoryCache = memoryCache; _loginService = loginService; _basicsRepositories = basicsRepositories; _boxRepositories = boxRepositories; @@ -438,5 +445,24 @@ namespace WMS.Web.Api.Controllers return Result.ReSuccess(res); } + + /// + /// 获取物料;通过规格型号 + /// + /// + /// + [HttpGet] + [Route("GetMaterialList")] + public ResultList GetMaterialList([FromQuery] string speci) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + + var materials = _memoryCache.Get>(_erpOptions.cache_materail_key); + if (materials == null) return ResultList.ReFailure(ResultCodes.MateriaNoData); + var result = materials.Where(x => x.Specifications.Equals(speci)).ToList(); + return ResultList.ReSuccess(result); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 5a99af45..8f5f0934 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -566,6 +566,13 @@ 序列号或规格型号或无聊编码 + + + 获取物料;通过规格型号 + + + + 盘点单 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index da66d6ac..7d6b9ca6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4087,6 +4087,31 @@ 物料规格型号 + + + 物料列表 + + + + + 物料ID + + + + + 物料名称 + + + + + 物料编码 + + + + + 物料规格型号 + + 单据编号