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

@@ -341,15 +341,18 @@ namespace WMS.Web.Api.Controllers
         /// 获取仓位：模糊名称
         /// </summary>
         ///  <param name="name">仓位名称模糊匹配</param>
+        ///  <param name="stockCode">仓库编码</param>
         /// <returns></returns>
         [HttpGet]
         [Route("GetSubUcStockByName")]
-        public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name)
+        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)
                 return Result<List<UcSubStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
             var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
+            if (!string.IsNullOrEmpty(stockCode))
+                r = r.Where(w => w.StockCode == stockCode).ToList();
             return Result<List<UcSubStockResponse>>.ReSuccess(r);
         }
         /// <summary>
@@ -496,7 +499,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             _logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode}");
-            var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode);
+            var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode,IsOps);
             if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
 
             _logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");

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

@@ -626,11 +626,12 @@
             <param name="name">客户名</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String,System.String)">
             <summary>
             获取仓位：模糊名称
             </summary>
              <param name="name">仓位名称模糊匹配</param>
+             <param name="stockCode">仓库编码</param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockPrecisionByName(System.String)">

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

@@ -4374,6 +4374,11 @@
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.MaterialResponse.IsOldOps">
+            <summary>
+            是否是老Ops条码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.MaterialSubStock">
             <summary>
             物料对应的仓位有哪些

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

@@ -45,5 +45,9 @@ namespace WMS.Web.Core.Dto
         /// 物料规格型号
         /// </summary>
         public string Specifications { get; set; }
+        /// <summary>
+        /// 是否是老Ops条码
+        /// </summary>
+        public bool IsOldOps { get; set; } = false;
     }
 }

src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs

@@ -389,13 +389,22 @@ namespace WMS.Web.Repositories.Configuration
                 ent.ToTable("t_wms_subscribe_notification");
                 ent.HasKey(x => x.Id);
 
+                var valueComparer = new ValueComparer<List<string>>(
+    (c1, c2) => c1.SequenceEqual(c2),
+    c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+    c => c.ToList());
+
                 ent.Property(f => f.Telephones).HasConversion(
          v => JsonConvert.SerializeObject(v),
-         v => JsonConvert.DeserializeObject<List<string>>(v));
+         v => JsonConvert.DeserializeObject<List<string>>(v))
+                .Metadata
+                .SetValueComparer(valueComparer);
 
                 ent.Property(f => f.Emails).HasConversion(
         v => JsonConvert.SerializeObject(v),
-        v => JsonConvert.DeserializeObject<List<string>>(v));
+        v => JsonConvert.DeserializeObject<List<string>>(v))
+                .Metadata
+                .SetValueComparer(valueComparer); ;
             });
 
             base.OnModelCreating(builder);

src/WMS.Web.Repositories/SerialNumbersRepositories.cs

@@ -256,6 +256,7 @@ namespace WMS.Web.Repositories
                 else
                     return null;
             }
+            response.IsOldOps = false;
             response.BoxId = entity.serial.BoxId;
             response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
             response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
@@ -290,6 +291,7 @@ namespace WMS.Web.Repositories
                 .SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
                 .FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
             if (entity == null || entity.serial == null) return null;
+            response.IsOldOps = true;
             response.BoxId = entity.serial.BoxId;
             response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
             response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";

src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs

@@ -143,14 +143,14 @@ namespace WMS.Web.Repositories
         {
             if (ids == null)
             {
-                return await _context.SubscribeNotification
+                return await _context.SubscribeNotification.Where(w => w.IsDelete != true)
                             .AsNoTracking().ToListAsync();
             }
             else
             {
                 return await _context.SubscribeNotification
                             .AsNoTracking()
-                            .Where(w => ids.Contains(w.Id))
+                            .Where(w => ids.Contains(w.Id) && w.IsDelete != true)
                             .ToListAsync();
             }
         }