From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Seed/DBContext.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Seed/DBContext.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Seed/DBContext.cs
index 85d3b5e..3f478e4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Seed/DBContext.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Seed/DBContext.cs
@@ -16,7 +16,7 @@
private static string _connectionString = connectObject.Connection;
private static DbType _dbType = (DbType)connectObject.DbType;
public static string ConnId = connectObject.ConnId;
- private SqlSugarClient _db;
+ private SqlSugarScope _db;
/// <summary>
/// 杩炴帴瀛楃涓�
@@ -51,7 +51,7 @@
/// <summary>
/// 鏁版嵁杩炴帴瀵硅薄
/// </summary>
- public SqlSugarClient Db
+ public SqlSugarScope Db
{
get { return _db; }
private set { _db = value; }
@@ -71,7 +71,7 @@
if (string.IsNullOrEmpty(_connectionString))
throw new ArgumentNullException("鏁版嵁搴撹繛鎺ュ瓧绗︿覆涓虹┖");
- _db = sqlSugarClient as SqlSugarClient;
+ _db = sqlSugarClient as SqlSugarScope;
//_db.Aop.DataExecuting = SqlSugarAop.DataExecuting;
}
@@ -188,29 +188,29 @@
/// </summary>
/// <param name="config">config</param>
/// <returns>杩斿洖鍊�</returns>
- public static SqlSugarClient GetCustomDB(ConnectionConfig config)
+ public static SqlSugarScope GetCustomDB(ConnectionConfig config)
{
- return new SqlSugarClient(config);
+ return new SqlSugarScope(config);
}
/// <summary>
/// 鍔熻兘鎻忚堪:鑾峰彇涓�涓嚜瀹氫箟鐨勬暟鎹簱澶勭悊瀵硅薄
/// </summary>
/// <param name="sugarClient">sugarClient</param>
/// <returns>杩斿洖鍊�</returns>
- public static SimpleClient<T> GetCustomEntityDB<T>(SqlSugarClient sugarClient) where T : class, new()
- {
- return new SimpleClient<T>(sugarClient);
- }
+ //public static SqlSugarScope<T> GetCustomEntityDB<T>(SqlSugarScope sugarClient) where T : class, new()
+ //{
+ // return new SqlSugarScope<T>(sugarClient);
+ //}
/// <summary>
/// 鍔熻兘鎻忚堪:鑾峰彇涓�涓嚜瀹氫箟鐨勬暟鎹簱澶勭悊瀵硅薄
/// </summary>
/// <param name="config">config</param>
/// <returns>杩斿洖鍊�</returns>
- public static SimpleClient<T> GetCustomEntityDB<T>(ConnectionConfig config) where T : class, new()
- {
- SqlSugarClient sugarClient = GetCustomDB(config);
- return GetCustomEntityDB<T>(sugarClient);
- }
+ //public static SimpleClient<T> GetCustomEntityDB<T>(ConnectionConfig config) where T : class, new()
+ //{
+ // SqlSugarScope sugarClient = GetCustomDB(config);
+ // return GetCustomEntityDB<T>(sugarClient);
+ //}
#endregion
}
}
--
Gitblit v1.9.3