From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
index 64d4d26..3f3a094 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
@@ -24,15 +24,14 @@
}
/// <inheritdoc />
- public virtual async Task<WmsArea> FindByNameAsync(string name, CancellationToken cancellationToken = default)
+ public virtual async Task<WmsArea> FindByNameAsync(string areaNo, CancellationToken cancellationToken = default)
{
return await (await GetDbSetAsync())
.IncludeDetails()
.OrderBy(t => t.Sort)
.Where(x => !x.IsDeleted)
- .FirstOrDefaultAsync(t => t.AreaName == name, GetCancellationToken(cancellationToken));
+ .FirstOrDefaultAsync(t => t.AreaNo == areaNo, GetCancellationToken(cancellationToken));
}
-
/// <summary>
/// 查看库区是否存在
--
Gitblit v1.9.3