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

调整序列号搜索接口

Browse Source
This commit is contained in:
18942506660
2023-11-11 17:39:08 +08:00
parent 45bfd94e69
commit 6cdcd2a36a
6 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,21 +259,21 @@ 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("GetSerialNumber/{serialNumber}")] [Route("GetMaterial/{serialNumber}")]
public async Task<Result<SerialNumbersResponse>> GetSerialNumbers([FromRoute] string serialNumber) public async Task<Result<MaterialResponse>> GetMaterial([FromRoute] 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)
return Result<SerialNumbersResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber); var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
return Result<SerialNumbersResponse>.ReSuccess(res); return Result<MaterialResponse>.ReSuccess(res);
} }
} }
} }

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

@@ -366,11 +366,11 @@
<param name="boxBillNos">必填</param> <param name="boxBillNos">必填</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSerialNumbers(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">

60
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2535,6 +2535,36 @@
用户在单点中维一ID 用户在单点中维一ID
</summary> </summary>
</member> </member>
<member name="T:WMS.Web.Core.Dto.MaterialResponse">
<summary>
序列号信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box"> <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box">
<summary> <summary>
箱号 箱号
@@ -3160,36 +3190,6 @@
每页条数 不传默认每页10 条 每页条数 不传默认每页10 条
</summary> </summary>
</member> </member>
<member name="T:WMS.Web.Core.Dto.SerialNumbersResponse">
<summary>
序列号信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.NameRequest"> <member name="T:WMS.Web.Core.Dto.SingleData.NameRequest">
<summary> <summary>
名称请求对象 名称请求对象

2
src/WMS.Web.Core/Dto/SerialNumbersResponse.cs → src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -7,7 +7,7 @@ namespace WMS.Web.Core.Dto
/// <summary> /// <summary>
/// 序列号信息 /// 序列号信息
/// </summary> /// </summary>
public class SerialNumbersResponse public class MaterialResponse
{ {
/// <summary> /// <summary>
/// 序列号 /// 序列号

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

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

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

@@ -109,7 +109,7 @@ namespace WMS.Web.Repositories
public async Task<List<SerialNumbers>> GetEntityListByBoxId(int boxId) public async Task<List<SerialNumbers>> GetEntityListByBoxId(int boxId)
{ {
var res = await _context.SerialNumbers var res = await _context.SerialNumbers
.Where(f => f.BoxId==boxId) .Where(f => f.BoxId == boxId)
.ToListAsync(); .ToListAsync();
return res.Clone(); return res.Clone();
@@ -120,21 +120,30 @@ namespace WMS.Web.Repositories
/// </summary> /// </summary>
/// <param name="serialNumbers"></param> /// <param name="serialNumbers"></param>
/// <returns></returns> /// <returns></returns>
public async Task<SerialNumbersResponse> GetSerialNumber(string serialNumber) public async Task<MaterialResponse> GetSerialNumber(string serialNumber)
{ {
SerialNumbersResponse response = new SerialNumbersResponse(); MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (!materials_result.IsSuccess)
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));
if (material != null)
{
response.MaterialId = material.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialId);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, material.MaterialId);
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialId);
return response;
}
var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber)); var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber));
response.SerialNumber = entity.SerialNumber; response.SerialNumber = entity.SerialNumber;
response.MaterialId = entity.MaterialId; response.MaterialId = entity.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId); response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId);
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialId); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialId);
return new SerialNumbersResponse(); return new MaterialResponse();
} }
} }
} }