From d921cf15df354f5631a790d13b75ce78953dee8b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 16 6月 2024 10:09:25 +0800
Subject: [PATCH] 2

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index d30fcb8..987804e 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -60,6 +60,8 @@
                 try
                 {
                     Do();
+
+                    Thread.Sleep(1000 * 10);
                 }
                 catch (Exception ex)
                 {
@@ -103,7 +105,7 @@
                             continue;
                         }
 
-                        Do_One(db, info, item, qualityData, WorkingProcedure);
+                        Do_One(db, info, item, qualityData, query_WorkingProcedureCurrent);
 
                         Thread.Sleep(1000);
                     }
@@ -135,7 +137,7 @@
                     }
                     //files = files.OrderByDescending(o => o.LastWriteTime).ToList();
                     files = files.OrderBy(o => o.LastWriteTime).ToList();//鏃堕棿鍗囧簭
-                    Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢files.Count()}涓伐浠秢pieceProcess.WorkPieceID} ");
+                    Log4NetHelper.WriteErrorLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢files.Count()}涓伐浠秢pieceProcess.WorkPieceID} ");
 
                     bool isGetQcSuccess = false;
 
@@ -143,7 +145,7 @@
                     {//鍙栧�掑簭鍖归厤鐨勬枃浠跺悕涓哄伐浠跺彿鐨勬枃浠�
                         if (file.Name.Contains(pieceProcess.WorkPieceID))
                         {
-                            Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢pieceProcess.WorkPieceID}");
+                            Log4NetHelper.WriteErrorLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢pieceProcess.WorkPieceID}");
 
                             WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
                             wplog.WorkPieceID = pieceProcess.WorkPieceID;
@@ -355,6 +357,7 @@
                             db.SaveChanges();
 
                             isGetQcSuccess = true;
+                            Log4NetHelper.WriteInfoLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢锛屾垚鍔熷鐞嗕簡鎸囧畾宸ヤ欢{info.WorkPieceID}鐨勬枃浠�");
 
                             break;
                         }
@@ -374,13 +377,13 @@
 
                         db.SaveChanges();
 
-                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢娌℃湁鎵惧埌鎸囧畾宸ヤ欢{info.WorkPieceID}鐨勬枃浠�");
+                        Log4NetHelper.WriteErrorLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢娌℃湁鎵惧埌鎸囧畾宸ヤ欢{info.WorkPieceID}鐨勬枃浠�");
                     }
                 }
             }
             catch (Exception ex)
             {
-                Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"鎸囧畾宸ヤ欢{info.WorkPieceID},OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
+                Log4NetHelper.WriteErrorLog(logType, $"鎸囧畾宸ヤ欢{info.WorkPieceID},OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
             }
         }
 

--
Gitblit v1.9.3