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

Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

Browse Source
This commit is contained in:
tongfei
2024-03-29 15:16:06 +08:00
parent 806af3bb70 0eae81e059
commit 9c2982cec0
8 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,15 +341,18 @@ namespace WMS.Web.Api.Controllers
/// 获取仓位：模糊名称
/// </summary>
/// <param name="name">仓位名称模糊匹配</param>
/// <param name="stockCode">仓库编码</param>
/// <returns></returns>
[HttpGet]
[Route("GetSubUcStockByName")]
public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name)
public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name, [FromQuery] string stockCode=null)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcSubStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
if (!string.IsNullOrEmpty(stockCode))
r = r.Where(w => w.StockCode == stockCode).ToList();
return Result<List<UcSubStockResponse>>.ReSuccess(r);
}
/// <summary>
@@ -496,7 +499,7 @@ namespace WMS.Web.Api.Controllers
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode,IsOps);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
_logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");

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

@@ -626,11 +626,12 @@
<param name="name">客户名</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String,System.String)">
<summary>
获取仓位：模糊名称
</summary>
<param name="name">仓位名称模糊匹配</param>
<param name="stockCode">仓库编码</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockPrecisionByName(System.String)">

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

@@ -4374,6 +4374,11 @@
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsOldOps">
<summary>
是否是老Ops条码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.MaterialSubStock">
<summary>
物料对应的仓位有哪些