From d2c19eb1f1d03dc494259f3df95bc63230c791a1 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 16:20:39 +0800
Subject: [PATCH] 添加任务删除功能并简化代码逻辑在 `ITaskService.cs` 中新增 `Delete` 方法以支持任务删除，并在 `TaskService.cs` 中实现该方法，适配任务并调用基类删除逻辑。同时，优化了 `RequestInbound.cs` 中的 `CreateAndSendEmptyTrayTask` 和 `RequestWmsTask` 方法，移除冗余注释和不必要的查询，提升代码可读性和维护性。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs
index 38320d9..ee96461 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs
@@ -395,7 +395,7 @@
/// <returns></returns>
public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, int top, string orderByFields)
{
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).ToList();
+ return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).IncludesAllFirstLayer().ToList();
}
/// <summary>
@@ -407,7 +407,7 @@
/// <returns></returns>
public virtual List<TEntity> QueryData(string where, int top, string orderByFields)
{
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).ToList();
+ return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).IncludesAllFirstLayer().ToList();
}
/// <summary>
@@ -435,7 +435,7 @@
public virtual List<TEntity> QueryData(string where, int pageIndex, int pageSize, string orderByFields)
{
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(!string.IsNullOrEmpty(where), where).ToPageList(pageIndex, pageSize);
+ .WhereIF(!string.IsNullOrEmpty(where), where).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize);
}
/// <summary>
@@ -452,6 +452,7 @@
var list = _db.Queryable<TEntity>()
.OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
.WhereIF(whereExpression != null, whereExpression)
+ .IncludesAllFirstLayer()
.ToPageList(pageIndex, pageSize, ref totalCount);
return new PageGridData<TEntity> { Rows = list, Total = totalCount };
@@ -481,6 +482,7 @@
List<TEntity> list = _db.Queryable<TEntity>()
.OrderBy(orderByModels)
.WhereIF(whereExpression != null, whereExpression)
+ .IncludesAllFirstLayer()
.ToPageList(pageIndex, pageSize, ref totalCount);
return new PageGridData<TEntity>(totalCount, list);
@@ -508,7 +510,7 @@
}
int totalCount = 0;
List<TEntity> list = _db.Queryable<TEntity>()
- .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).ToPageList(pageIndex, pageSize, ref totalCount);
+ .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize, ref totalCount);
return new PageGridData<TEntity>(totalCount, list);
}
@@ -878,6 +880,16 @@
return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderBy(orderByModels).ToList();
}
+ public Task<bool> UpdateDataNavAsync(TEntity Entity)
+ {
+ return _db.UpdateNav(Entity).IncludesAllFirstLayer().ExecuteCommandAsync();
+ }
+
+ public bool UpdateDataNav(TEntity Entity)
+ {
+ return _db.UpdateNav(Entity).IncludesAllFirstLayer().ExecuteCommand();
+ }
+
//List<TResult> QueryMuch<T, T2, T3, TResult>(
// Expression<Func<T, T2, T3, object[]>> joinExpression,
// Expression<Func<T, T2, T3, TResult>> selectExpression,
--
Gitblit v1.9.3