diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 2ca46bf5..aa15d293 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 2b517e8e..78d71ba0 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -323,10 +323,12 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return Result>.ReFailure(ResultCodes.Token_Invalid_Error); var customers = await _erpService.BillQueryForCustomer(); - + List pullList = new List(); 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 /// [HttpGet] [Route("GetSubUcStockByName")] - public async Task>> GetSubUcStockByName([FromQuery] string name, [FromQuery] string stockCode=null) + public async Task>> 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.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.ReFailure(ResultCodes.MateriaNoData); _logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}"); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index aa10a6e7..a8ffe0f9 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4374,6 +4374,11 @@ 仓位编码(序列号不存在库存的话仓位是"") + + + 仓库编码 + + 是否存在于箱库存中 diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs index a53991c5..28f39480 100644 --- a/src/WMS.Web.Core/Dto/MaterialResponse.cs +++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs @@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto /// public string SubStockCode { get; set; } = ""; /// + /// 仓库编码 + /// + public string StockCode { get; set; } = ""; + /// /// 是否存在于箱库存中 /// public bool IsBoxInventory { get; set; } = false; diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 98c53b3f..c27faa74 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -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;