diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index fb8a2235..74db4063 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -259,21 +259,21 @@ namespace WMS.Web.Api.Controllers
}
///
- /// 根据序列号搜索信息-PDA
+ /// 根据序列号或规格型号搜索物料信息-PDA
///
- /// 必填
+ /// 序列号或规格型号
///
[HttpGet]
- [Route("GetSerialNumber/{serialNumber}")]
- public async Task> GetSerialNumbers([FromRoute] string serialNumber)
+ [Route("GetMaterial/{serialNumber}")]
+ public async Task> GetMaterial([FromRoute] string serialNumber)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
- return Result.ReFailure(ResultCodes.Token_Invalid_Error);
+ return Result.ReFailure(ResultCodes.Token_Invalid_Error);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
- return Result.ReSuccess(res);
+ return Result.ReSuccess(res);
}
}
}
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 222acae4..41905ed7 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -366,11 +366,11 @@
必填
-
+
- 根据序列号搜索信息-PDA
+ 根据序列号或规格型号搜索物料信息-PDA
- 必填
+ 序列号或规格型号
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index d7acba93..c5076000 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2535,6 +2535,36 @@
用户在单点中维一ID
+
+
+ 序列号信息
+
+
+
+
+ 序列号
+
+
+
+
+ 物料ID
+
+
+
+
+ 物料名称
+
+
+
+
+ 物料编码
+
+
+
+
+ 物料规格型号
+
+
箱号
@@ -3160,36 +3190,6 @@
每页条数 不传默认每页10 条
-
-
- 序列号信息
-
-
-
-
- 序列号
-
-
-
-
- 物料ID
-
-
-
-
- 物料名称
-
-
-
-
- 物料编码
-
-
-
-
- 物料规格型号
-
-
名称请求对象
diff --git a/src/WMS.Web.Core/Dto/SerialNumbersResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs
similarity index 95%
rename from src/WMS.Web.Core/Dto/SerialNumbersResponse.cs
rename to src/WMS.Web.Core/Dto/MaterialResponse.cs
index b16a76af..b6ee0d6a 100644
--- a/src/WMS.Web.Core/Dto/SerialNumbersResponse.cs
+++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs
@@ -7,7 +7,7 @@ namespace WMS.Web.Core.Dto
///
/// 序列号信息
///
- public class SerialNumbersResponse
+ public class MaterialResponse
{
///
/// 序列号
diff --git a/src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs b/src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
index 3521118c..be882983 100644
--- a/src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
@@ -20,7 +20,7 @@ namespace WMS.Web.Domain.Infrastructure
///
Task AddRange(List entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
- Task GetSerialNumber(string serialNumber);
+ Task GetSerialNumber(string serialNumber);
/// 查询实体集合
Task> GetEntityList(List serialNumbers);
/// 根据箱Id查询集合
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 4a3af79e..39263271 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -109,7 +109,7 @@ namespace WMS.Web.Repositories
public async Task> GetEntityListByBoxId(int boxId)
{
var res = await _context.SerialNumbers
- .Where(f => f.BoxId==boxId)
+ .Where(f => f.BoxId == boxId)
.ToListAsync();
return res.Clone();
@@ -120,21 +120,30 @@ namespace WMS.Web.Repositories
///
///
///
- public async Task GetSerialNumber(string serialNumber)
+ public async Task GetSerialNumber(string serialNumber)
{
- SerialNumbersResponse response = new SerialNumbersResponse();
+ MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return response;
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));
response.SerialNumber = entity.SerialNumber;
response.MaterialId = entity.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId);
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialId);
- return new SerialNumbersResponse();
+ return new MaterialResponse();
}
}
}