增加接口
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Newtonsoft.Json;
|
||||
@@ -33,9 +34,13 @@ namespace WMS.Web.Api.Controllers
|
||||
private readonly IErpService _erpService;
|
||||
private readonly ISingleDataService _singleDataService;
|
||||
private readonly ISerialNumbersRepositories _serialNumbersRepositories;
|
||||
private readonly IBoxInventoryRepositories _boxInventoryRepositories;
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
|
||||
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories,
|
||||
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService,
|
||||
ISerialNumbersRepositories serialNumbersRepositories)
|
||||
ISerialNumbersRepositories serialNumbersRepositories, IBoxInventoryRepositories boxInventoryRepositories,
|
||||
IMapper mapper, IErpBasicDataExtendService erpBasicDataExtendService)
|
||||
{
|
||||
_loginService = loginService;
|
||||
_basicsRepositories = basicsRepositories;
|
||||
@@ -43,6 +48,9 @@ namespace WMS.Web.Api.Controllers
|
||||
_erpService = erpService;
|
||||
_singleDataService = singleDataService;
|
||||
_serialNumbersRepositories = serialNumbersRepositories;
|
||||
_boxInventoryRepositories = boxInventoryRepositories;
|
||||
_mapper = mapper;
|
||||
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -303,6 +311,43 @@ namespace WMS.Web.Api.Controllers
|
||||
return ResultList<BoxResponse>.ReSuccess(res);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据箱号获取箱信息(综合)
|
||||
/// </summary>
|
||||
/// <param name="boxBillNo">必填</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("GetBoxSynthesis")]
|
||||
public async Task<Result<BoxResponse>> GetBoxSynthesis([FromQuery] string boxBillNo)
|
||||
{
|
||||
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||
return Result<BoxResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||
|
||||
var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo);
|
||||
BoxResponse boxResponse= _mapper.Map<BoxResponse>(result);
|
||||
if (boxResponse != null)
|
||||
{
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return Result<BoxResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||
var materials = materials_result.Data.ToList();
|
||||
|
||||
foreach (var detail in boxResponse.Details)
|
||||
{
|
||||
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId);
|
||||
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId);
|
||||
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId);
|
||||
}
|
||||
boxResponse.TotalQty = boxResponse.Details.Sum(s => s.Qty);
|
||||
return Result<BoxResponse>.ReSuccess(boxResponse);
|
||||
}
|
||||
|
||||
var res = await _boxRepositories.GetBox(new List<string>() { boxBillNo });
|
||||
if (res.Count() <= 0) return Result<BoxResponse>.ReSuccess(null);
|
||||
return Result<BoxResponse>.ReSuccess(res.First());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据序列号或规格型号搜索物料信息-PDA
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user