<update>[normal]更新数据清理，清理电子标签任务，清理输送机任务

WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs

@@ -39,10 +39,17 @@ public class DataClear(ClearData clearData)
             // 清理WMS任务表 -- 保留多少天
             int apiWmsTaskCount = _clearData.ClearWmsTaskData(30);
             ConsoleLog.Tip(apiWmsTaskCount > 0, $"[数据清理]WMS任务记录：{apiWmsTaskCount}");
+
+            // 清理电子标签任务
+            int clearElTagCount = _clearData.ClearElTagTaskData(30);
+            ConsoleLog.Tip(clearElTagCount > 0, $"[数据清理]电子标签任务记录：{apiWmsTaskCount}");
+
+
+
         }
         catch (Exception ex)
         {
-            ConsoleLog.Error($"[数据清理]线程发生异常，异常信息：{ex}");
+            ConsoleLog.Exception($"【数据清理】线程发生异常，异常信息：{ex}");
         }
 
 

WcsMain/Business/CommonAction/ClearData.cs

@@ -8,14 +8,16 @@ namespace WcsMain.Business.CommonAction;
 /// 清理数据类
 /// </summary>
 [Component]
-public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppApiRequestDao apiRequestDao, AppApiAcceptDao apiAcceptDao)
+public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppApiRequestDao apiRequestDao, 
+    AppApiAcceptDao apiAcceptDao, AppElTagTaskDao elTagTaskDao, AppConveyTaskDao conveyTaskDao)
 {
 
     private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao;
     private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao;
     private readonly AppApiRequestDao _apiRequestDao = apiRequestDao;
     private readonly AppApiAcceptDao _apiAcceptDao = apiAcceptDao;
-
+    private readonly AppElTagTaskDao _elTagTaskDao = elTagTaskDao;
+    private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao;
 
 
     /* 定时清除 WMS 任务表 */
@@ -23,22 +25,43 @@ public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppAp
     /// 清理超过一定时间的 WMS 任务表数据
     /// </summary>
     /// <param name="days"></param>
-    public int ClearWmsTaskData(int days)
+    public int ClearWmsTaskData(int days) => _wmsTaskDao.ClearData(days);
-    {
-        return _wmsTaskDao.ClearData(days);
-
-    }
-
 
     /* 定时清除 WCS 任务备份表 */
     /// <summary>
     /// 清理超过一定天数的 WCS 任务备份表数据
     /// </summary>
     /// <param name="days"></param>
-    public int ClearWcsTaskData(int days)
+    public int ClearWcsTaskData(int days) => _wcsTaskDao.ClearData(days);
-    {
+
-        return _wcsTaskDao.ClearData(days);
+    /* 定时清除接口请求表 */
-    }
+    /// <summary>
+    /// 清理接口发送信息表
+    /// </summary>
+    /// <param name="days"></param>
+    public int ClearApiRequestData(int days) => _apiRequestDao.ClearData(days);
+
+    /* 定时清除接口接收表 */
+    /// <summary>
+    /// 清理接口接收信息表
+    /// </summary>
+    /// <param name="days"></param>
+    public int ClearApiAcceptData(int days) => _apiAcceptDao.ClearData(days);
+
+    /// <summary>
+    /// 清理多少天之前的电子标签任务
+    /// </summary>
+    /// <param name="days"></param>
+    /// <returns></returns>
+    public int ClearElTagTaskData(int days) => _elTagTaskDao.ClearData(days);
+
+    /// <summary>
+    /// 清理输送线任务
+    /// </summary>
+    /// <param name="days"></param>
+    /// <returns></returns>
+    public int ClearConveyTask(int days) => _conveyTaskDao.ClearData(days);
+
 
     /* 定时清除 日志文件 */
     /// <summary>
@@ -77,28 +100,6 @@ public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppAp
         return clearCount;
     }
 
-    /* 定时清除接口请求表 */
-    /// <summary>
-    /// 清理接口发送信息表
-    /// </summary>
-    /// <param name="days"></param>
-    public int ClearApiRequestData(int days)
-    {
-        return _apiRequestDao.ClearData(days);
-    }
-
-
-
-    /* 定时清除接口接收表 */
-    /// <summary>
-    /// 清理接口接收信息表
-    /// </summary>
-    /// <param name="days"></param>
-    public int ClearApiAcceptData(int days)
-    {
-        return _apiAcceptDao.ClearData(days);
-    }
-
 
 
 }

WcsMain/DataBase/Dao/AppConveyTaskDao.cs

@@ -34,4 +34,41 @@ public class AppConveyTaskDao
     }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+    /*************************************** 业务 **************************************************/
+
+
+
+    /// <summary>
+    /// 清理数据
+    /// </summary>
+    /// <param name="days"></param>
+    /// <returns></returns>
+    public int ClearData(int days)
+    {
+        try
+        {
+            var sqlFuc = CommonTool.DbServe.Deleteable<AppConveyTask>()
+                .Where(w => w.CreateTime < DateTime.Now.AddDays(-days));
+            return sqlFuc.ExecuteCommand();
+        }
+        catch(Exception ex)
+        {
+            _ = ex;
+            return 0;
+        }
+    }
+    
+
 }

WcsMain/DataBase/Dao/AppElTagTaskDao.cs

@@ -157,4 +157,25 @@ public class AppElTagTaskDao
     }
 
 
+    /// <summary>
+    /// 清理多少天之前的数据
+    /// </summary>
+    /// <param name="days"></param>
+    /// <returns></returns>
+    public int ClearData(int days)
+    {
+        try
+        {
+            var sqlFuc = CommonTool.DbServe.Deleteable<AppElTagTask>()
+                .Where(w => w.CreateTime < DateTime.Now.AddDays(-days));
+            return sqlFuc.ExecuteCommand();
+        }
+        catch (Exception ex)
+        {
+            _ = ex;
+            return default;
+        }
+    }
+
+
 }