From a97a624c1fb269a059f97629076433c46b4e8b4c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 13 8月 2025 14:42:08 +0800
Subject: [PATCH] //如果是连续打印,则不调用打印服务,解决重复打印的问题 【Editby shaocx,2025-08-13】

---
 CC/iWareSql/DataAccess/ClearDataHandler.cs |   77 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/CC/iWareSql/DataAccess/ClearDataHandler.cs b/CC/iWareSql/DataAccess/ClearDataHandler.cs
index 0de5dde..6b7e989 100644
--- a/CC/iWareSql/DataAccess/ClearDataHandler.cs
+++ b/CC/iWareSql/DataAccess/ClearDataHandler.cs
@@ -19,28 +19,28 @@
     public class ClearDataHandler
     {
         /// <summary>
-        /// 绉婚櫎XX澶╁墠鐨� 寮傚父琛� 鏁版嵁
+        /// 绉婚櫎XX澶╁墠鐨� wms_record_print 鏁版嵁
         /// </summary>
         /// <param name="edm"></param>
-        public static void Delete_Base_SysExceptionInfo(int days)
+        public static void Delete_wms_record_print(int days)
         {
             try
             {
-                using (DbModel edm = new DbModel())
+                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                 {
                     var queryTime = DateTime.Now.AddDays(-days);
 
-                    var removeList = edm.Base_SysExceptionInfo.Where(x => x.createTime <= queryTime).ToList();
+                    var removeList = edm.wms_record_print.Where(x => x.CreateTime <= queryTime).ToList();
                     if (removeList != null && removeList.Count > 0)
                     {
-                        edm.Base_SysExceptionInfo.RemoveRange(removeList);
+                        edm.wms_record_print.RemoveRange(removeList);
                     }
                     edm.SaveChanges();
                 }
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 寮傚父琛� 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 寮傚父琛� 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
@@ -66,33 +66,33 @@
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
         /// <summary>
-        /// 绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁
+        /// 绉婚櫎XX澶╁墠鐨� mes_push_papercut 鏁版嵁
         /// </summary>
         /// <param name="edm"></param>
-        public static void Delete_Task_RequestLog(int days)
+        public static void Delete_mes_push_papercut(int days)
         {
             try
             {
-                using (DbModel edm = new DbModel())
+                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                 {
                     var queryTime = DateTime.Now.AddDays(-days);
 
-                    var removeList = edm.Task_RequestLog.Where(x => x.CreateTime <= queryTime).ToList();
+                    var removeList = edm.mes_push_papercut.Where(x => x.CreateTime <= queryTime).ToList();
                     if (removeList != null && removeList.Count > 0)
                     {
-                        edm.Task_RequestLog.RemoveRange(removeList);
+                        edm.mes_push_papercut.RemoveRange(removeList);
                     }
                     edm.SaveChanges();
                 }
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
@@ -118,7 +118,7 @@
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
@@ -145,7 +145,7 @@
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� MES_BTJReceiveReq 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� MES_BTJReceiveReq 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
         /// <summary>
@@ -170,7 +170,7 @@
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� MES_OnLineReq 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� MES_OnLineReq 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
@@ -179,30 +179,55 @@
         /// 绉婚櫎XX澶╁墠鐨� 璁惧浠诲姟琛� 鏁版嵁
         /// </summary>
         /// <param name="edm"></param>
-        public static void Delete_Task_Part(int days)
+        public static void Delete_mes_push_packagecode(int days)
         {
             try
             {
-                using (DbModel edm = new DbModel())
+                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                 {
                     var queryTime = DateTime.Now.AddDays(-days);
 
-                    var queryTaskState1 = (int)DeviceTaskStatusEnum.宸插彇娑�;
-                    var queryTaskState2 = (int)DeviceTaskStatusEnum.宸插畬鎴�;
-
-                    var removeList = edm.Task_Part.Where(x => x.CreateTime <= queryTime
-                        && (x.TaskState == queryTaskState1 || x.TaskState == queryTaskState2)
+                 
+                    var removeList = edm.mes_push_packagecode.Where(x => x.CreateTime <= queryTime
                         ).ToList();
                     if (removeList != null && removeList.Count > 0)
                     {
-                        edm.Task_Part.RemoveRange(removeList);
+                        edm.mes_push_packagecode.RemoveRange(removeList);
                     }
                     edm.SaveChanges();
                 }
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+            }
+        }
+
+        /// <summary>
+        /// 绉婚櫎XX澶╁墠鐨� 璁惧浠诲姟琛� 鏁版嵁
+        /// </summary>
+        /// <param name="edm"></param>
+        public static void Delete_wms_rbline_task(int days)
+        {
+            try
+            {
+                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
+                {
+                    var queryTime = DateTime.Now.AddDays(-days);
+
+
+                    var removeList = edm.wms_rbline_task.Where(x => x.CreateTime <= queryTime
+                        ).ToList();
+                    if (removeList != null && removeList.Count > 0)
+                    {
+                        edm.wms_rbline_task.RemoveRange(removeList);
+                    }
+                    edm.SaveChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 
@@ -229,7 +254,7 @@
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璁惧鎶ヨ 鏁版嵁 鍑虹幇寮傚父", ex);
+                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璁惧鎶ヨ 鏁版嵁 鍑虹幇寮傚父", ex);
             }
         }
 

--
Gitblit v1.9.3