From cde56aae50adc11ff8db84e424d873843c566bfd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 23:40:41 +0800
Subject: [PATCH] 优化WCS移库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
index 681b8e3..f49b6a9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
@@ -36,38 +36,38 @@
ISqlSugarClient db = _dbBase;
//澶氱鎴�
- var mta = typeof(TEntity).GetCustomAttribute<MultiTenantAttribute>();
- if (mta is { TenantType: TenantTypeEnum.Db })
- {
- //鑾峰彇绉熸埛淇℃伅 绉熸埛淇℃伅鍙互鎻愬墠缂撳瓨涓嬫潵
- if (App.User is { TenantId: > 0 })
- {
- dynamic tenant = db.Queryable(MainDb.TenantTableName, "x").Where(MainDb.TenantId, "=", App.User.TenantId).First();
- if (tenant != null)
- {
- var iTenant = db.AsTenant();
- if (!iTenant.IsAnyConnection(tenant.TenantId))
- {
- string conStr = tenant.ConnectionString;
- ConnectionConfig connectionConfig = new ConnectionConfig()
- {
- ConfigId = tenant.TenantId,
- ConnectionString = conStr.DecryptDES(AppSecret.DB),
- DbType = (SqlSugar.DbType)tenant.DbType,
- IsAutoCloseConnection = true,
- AopEvents = new AopEvents()
- {
- DataExecuting = SqlSugarAop.DataExecuting,
+ //var mta = typeof(TEntity).GetCustomAttribute<MultiTenantAttribute>();
+ //if (mta is { TenantType: TenantTypeEnum.Db })
+ //{
+ // //鑾峰彇绉熸埛淇℃伅 绉熸埛淇℃伅鍙互鎻愬墠缂撳瓨涓嬫潵
+ // if (App.User is { TenantId: > 0 })
+ // {
+ // dynamic tenant = db.Queryable(MainDb.TenantTableName, "x").Where(MainDb.TenantId, "=", App.User.TenantId).First();
+ // if (tenant != null)
+ // {
+ // var iTenant = db.AsTenant();
+ // if (!iTenant.IsAnyConnection(tenant.TenantId))
+ // {
+ // string conStr = tenant.ConnectionString;
+ // ConnectionConfig connectionConfig = new ConnectionConfig()
+ // {
+ // ConfigId = tenant.TenantId,
+ // ConnectionString = conStr.DecryptDES(AppSecret.DB),
+ // DbType = (SqlSugar.DbType)tenant.DbType,
+ // IsAutoCloseConnection = true,
+ // AopEvents = new AopEvents()
+ // {
+ // DataExecuting = SqlSugarAop.DataExecuting,
- }
- };
- iTenant.AddConnection(connectionConfig);
- }
+ // }
+ // };
+ // iTenant.AddConnection(connectionConfig);
+ // }
- return iTenant.GetConnection(tenant.TenantId);
- }
- }
- }
+ // return iTenant.GetConnection(tenant.TenantId);
+ // }
+ // }
+ //}
return db;
}
@@ -517,7 +517,7 @@
{
OrderByModel orderByModel = new OrderByModel()
{
- FieldName = item.Key,
+ FieldName = item.Key.FirstLetterToUpper(),
OrderByType = item.Value
};
orderByModels.Add(orderByModel);
--
Gitblit v1.9.3