18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-11 14:43:43 +08:00
parent 44927618e2
commit 62514703b9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -357,13 +357,13 @@ namespace WMS.Web.Api.Controllers
} }
/// <summary> /// <summary>
/// 根据序列号或规格型号搜索物料信息-PDA /// 根据序列号或规格型号,物料编码搜索物料信息-PDA
/// </summary> /// </summary>
/// <param name="serialNumber">序列号或规格型号</param> /// <param name="serialNumber">序列号或规格型号或无聊编码</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("GetMaterial/{serialNumber}")] [Route("GetMaterial/{serialNumber}")]
public async Task<Result<MaterialResponse>> GetMaterial([FromRoute] string serialNumber) public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber)
{ {
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)

4
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -519,9 +519,9 @@
</member> </member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String)"> <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String)">
<summary> <summary>
根据序列号或规格型号搜索物料信息-PDA 根据序列号或规格型号,物料编码搜索物料信息-PDA
</summary> </summary>
<param name="serialNumber">序列号或规格型号</param> <param name="serialNumber">序列号或规格型号或无聊编码</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:WMS.Web.Api.Controllers.TakeStockController"> <member name="T:WMS.Web.Api.Controllers.TakeStockController">

2
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -186,7 +186,7 @@ namespace WMS.Web.Repositories
return response; return response;
var materials = materials_result.Data.ToList(); 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) if (material != null)
{ {
response.MaterialId = material.MaterialId; response.MaterialId = material.MaterialId;