Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
@@ -6,7 +6,10 @@ using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using WMS.Web.Core;
|
||||
using WMS.Web.Core.Dto;
|
||||
using WMS.Web.Core.Dto.SingleData;
|
||||
using WMS.Web.Core.Internal.Results;
|
||||
using WMS.Web.Domain.Infrastructure;
|
||||
using WMS.Web.Domain.IService.Public;
|
||||
using WMS.Web.Domain.Values;
|
||||
|
||||
namespace WMS.Web.Api.Controllers
|
||||
@@ -18,8 +21,12 @@ namespace WMS.Web.Api.Controllers
|
||||
[ApiController]
|
||||
public class SysConfigController : ControllerBase
|
||||
{
|
||||
public SysConfigController()
|
||||
private readonly ILoginService _loginService;
|
||||
private readonly IBasicsRepositories _basicsRepositories;
|
||||
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories)
|
||||
{
|
||||
_loginService = loginService;
|
||||
_basicsRepositories = basicsRepositories;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -55,5 +62,38 @@ namespace WMS.Web.Api.Controllers
|
||||
//1
|
||||
return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取仓库
|
||||
/// </summary>
|
||||
/// <param name="name">仓库模糊匹配 不必填</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("GetUcStock")]
|
||||
public async Task<ResultList<UcStockResponse>> GetUcStock([FromQuery] string name)
|
||||
{
|
||||
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||
return ResultList<UcStockResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||
var r = await _basicsRepositories.GetUcStockAsync(name, loginInfo.UserInfo.CompanyId);
|
||||
return ResultList<UcStockResponse>.ReSuccess(r);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据仓库获取仓位
|
||||
/// </summary>
|
||||
/// <param name="id">仓库id</param>
|
||||
/// <param name="name">仓库模糊匹配 不必填</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("GetSubUcStock/{id}")]
|
||||
public async Task<Result<List<UcStockResponse>>> GetSubUcStock([FromRoute] int id, [FromQuery] string name)
|
||||
{
|
||||
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||
var r = await _basicsRepositories.GetSubUcStockAsync(id, name);
|
||||
return Result<List<UcStockResponse>>.ReSuccess(r);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user