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-03-29 15:16:06 +08:00
parent 806af3bb70 0eae81e059
commit 9c2982cec0
8 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
View File

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

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

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

4
src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
View File

@@ -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();
}
}