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-10 14:32:13 +08:00
parent e10ef1c136
commit 53a52104fa
8 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -87,23 +87,45 @@ namespace WMS.Web.Api.Controllers
}
/// <summary>
/// 根据出库单任务编号搜索-PDA出库
/// 根据出库单任务编号模糊搜索-PDA出库
/// </summary>
/// <param name="billNo"></param>
/// <returns></returns>
[HttpGet]
[Route("GetOutStockTaskByNo/{billNo}")]
public async Task<ResultList<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
[Route("GetOutStockTaskListByNo/{billNo}")]
public async Task<ResultList<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo([FromRoute] string billNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var res = await _repositories.GetOutStockTaskByNo(billNo);
var res = await _repositories.GetOutStockTaskListByNo(billNo);
if (res == null) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
}
/// <summary>
/// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
/// </summary>
/// <param name="billNo"></param>
/// <returns></returns>
[HttpGet]
[Route("GetOutStockTaskByNo/{billNo}")]
public async Task<Result<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
//搜索之前同步金蝶数据
await _outStockTaskService.Ssyn(new List<string>() { billNo });
var res = await _repositories.GetOutStockTaskByNo(billNo);
if (res == null) return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
return Result<GetOutStockTaskByNoResponse>.ReSuccess(res);
}
/// <summary>
/// 刷新金蝶数据
/// </summary>

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

@@ -115,9 +115,9 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetOrg")]
public async Task<ResultList<ErpOrgDto>> GetOrg()
public async Task<ResultList<ErpOrgDto>> GetOrg()
{
var orgs_result=await _erpService.BillQueryForOrg();
var orgs_result = await _erpService.BillQueryForOrg();
return orgs_result;
}
@@ -166,7 +166,7 @@ namespace WMS.Web.Api.Controllers
if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
{
var subs = await _erpService.BillQueryForSubStock(number);
foreach (var s in subs.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
foreach (var s in subs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
{
list.Add(new UcStockResponse()
{
@@ -183,10 +183,11 @@ namespace WMS.Web.Api.Controllers
/// <summary>
/// 获取出库单客户下拉列表
/// </summary>
/// <param name="name">客户名</param>
/// <returns></returns>
[HttpGet]
[Route("GetCustomers")]
public async Task<Result<List<PullDownStrResponse>>> GetCustomers()
[Route("GetCustomers/{name}")]
public async Task<Result<List<PullDownStrResponse>>> GetCustomers([FromRoute] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
@@ -194,7 +195,7 @@ namespace WMS.Web.Api.Controllers
var customers = await _erpService.BillQueryForCustomer();
var orgs = await _erpService.BillQueryForOrg();
List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
foreach (var c in customers.Data)
foreach (var c in customers.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
{
pullList.Add(new PullDownStrResponse()
{
@@ -203,7 +204,7 @@ namespace WMS.Web.Api.Controllers
Code = c.Number
});
}
foreach (var o in orgs.Data)
foreach (var o in orgs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
{
pullList.Add(new PullDownStrResponse()
{