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-25 17:15:56 +08:00
parent 6de7629998
commit 0b21e0b035
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,28 +199,26 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetErp_SubUcStock/{number}/{orgCode}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name)
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromRoute] string orgCode, [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);
List<UcStockResponse> list = new List<UcStockResponse>();
//if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
//{
//var subs = await _erpService.BillQueryForSubStock(number,orgCode);
var subs = await _erpService.BillQueryForSubStock(null, null);
foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name)
if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
return Result<List<UcStockResponse>>.ReSuccess(list);
var subs = await _erpService.BillQueryForSubStock(number, orgCode);
//var subs = await _erpService.BillQueryForSubStock(null, null);
list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse()
{
list.Add(new UcStockResponse()
{
Id = s.Id,
Code = s.Code,
Name = s.Name,
Disable = false
});
}
//}
Id = s.Id,
Code = s.Code,
Name = s.Name,
Disable = false
}).ToList();//.Skip(0).Take(10)
return Result<List<UcStockResponse>>.ReSuccess(list);
}
@@ -330,7 +328,7 @@ namespace WMS.Web.Api.Controllers
return Result<BoxResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo);
BoxResponse boxResponse= _mapper.Map<BoxResponse>(result);
BoxResponse boxResponse = _mapper.Map<BoxResponse>(result);
if (boxResponse != null)
{
var materials_result = await _erpService.BillQueryForMaterial();