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-04-09 13:51:01 +08:00
parent c835f25b79 01151f8d6a
commit e719702bae
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

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

@@ -323,10 +323,12 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<PullDownStrResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
var customers = await _erpService.BillQueryForCustomer();
List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
foreach (var c in customers.Data.Where(w => w.Name.Contains(name)))
{
//排除重复的code
if (pullList.Where(f => f.Code == c.Number).Any()) continue;
pullList.Add(new PullDownStrResponse()
{
Id = c.Id.ToString(),
@@ -345,7 +347,7 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetSubUcStockByName")]
public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name, [FromQuery] string stockCode=null)
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)
@@ -499,8 +501,8 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode,IsOps, IsIncludeDelete);
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 是否包含冻结 {IsIncludeDelete}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, IsIncludeDelete);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
_logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");

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.StockCode">
<summary>
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsBoxInventory">
<summary>
是否存在于箱库存中

4
src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto
/// </summary>
public string SubStockCode { get; set; } = "";
/// <summary>
/// 仓库编码
/// </summary>
public string StockCode { get; set; } = "";
/// <summary>
/// 是否存在于箱库存中
/// </summary>
public bool IsBoxInventory { get; set; } = false;

2
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -262,6 +262,7 @@ namespace WMS.Web.Repositories
response.BoxId = entity.serial.BoxId;
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
@@ -300,6 +301,7 @@ namespace WMS.Web.Repositories
response.BoxId = entity.serial.BoxId;
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;