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

获取物料接口增加参数

Browse Source
This commit is contained in:
18942506660
2024-03-05 11:18:02 +08:00
parent 896d2a8507
commit 898eb35a28
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,18 +432,19 @@ namespace WMS.Web.Api.Controllers
/// <summary>
/// 根据序列号或规格型号,物料编码搜索物料信息-PDA
/// </summary>
/// <param name="serialNumber">序列号或规格型号或无聊编码</param>
/// <param name="serialNumber">序列号或规格型号或物料编码</param>
/// <param name="orgCode">组织编码</param>
/// <returns></returns>
[HttpGet]
[Route("GetMaterial")]
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber)
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
return Result<MaterialResponse>.ReSuccess(res);

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

@@ -565,11 +565,12 @@
<param name="boxBillNo">必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String,System.String)">
<summary>
根据序列号或规格型号,物料编码搜索物料信息-PDA
</summary>
<param name="serialNumber">序列号或规格型号或无聊编码</param>
<param name="serialNumber">序列号或规格型号或物料编码</param>
<param name="orgCode">组织编码</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterialList(System.String)">

2
src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
View File

@@ -21,7 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
Task<MaterialResponse> GetSerialNumber(string serialNumber);
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode);
//根据序列号搜索信息
Task<SerialNumbersResponse> Get(string serialNumber);
/// 查询实体集合

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

@@ -178,7 +178,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -186,7 +186,10 @@ namespace WMS.Web.Repositories
return response;
var materials = materials_result.Data.ToList();
var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)|| f.MaterialNumber.Equals(serialNumber));
var m = materials.Where(f => (f.Specifications.Equals(serialNumber) || f.MaterialNumber.Equals(serialNumber)));
if (!string.IsNullOrEmpty(orgCode))
m = m.Where(w => w.OrgId.Equals(orgCode));
var material = m.FirstOrDefault();
if (material != null)
{
response.MaterialId = material.MaterialId;