Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -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}");
+            _logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 是否包含冻结 {IsIncludeDelete}");
-            var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode,IsOps, IsIncludeDelete);
+            var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, IsIncludeDelete);
             if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
 
             _logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -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>
             是否存在于箱库存中

src/WMS.Web.Core/Dto/MaterialResponse.cs

@@ -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;

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;