diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 6102cdd1..8719f032 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -357,13 +357,13 @@ namespace WMS.Web.Api.Controllers } /// - /// 根据序列号或规格型号搜索物料信息-PDA + /// 根据序列号或规格型号,物料编码搜索物料信息-PDA /// - /// 序列号或规格型号 + /// 序列号或规格型号或无聊编码 /// [HttpGet] [Route("GetMaterial/{serialNumber}")] - public async Task> GetMaterial([FromRoute] string serialNumber) + public async Task> GetMaterial([FromQuery] string serialNumber) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 9b767d07..8a39cd50 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -519,9 +519,9 @@ - 根据序列号或规格型号搜索物料信息-PDA + 根据序列号或规格型号,物料编码搜索物料信息-PDA - 序列号或规格型号 + 序列号或规格型号或无聊编码 diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 1fd9d577..1d86964a 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -186,7 +186,7 @@ namespace WMS.Web.Repositories return response; var materials = materials_result.Data.ToList(); - var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)); + var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)|| f.MaterialNumber.Equals(serialNumber)); if (material != null) { response.MaterialId = material.MaterialId;