From 3fc83007da4ba3442254bf36db0753514a0df1b0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 26 6月 2024 19:58:22 +0800
Subject: [PATCH] 2

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
index ae9bc7b..a775440 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
@@ -87,9 +87,6 @@
                     //plcService.OpenService();
                 }
                 string value_05 = "";
-                string path = ConfigHelper.GetConfigString("OP80QualityData");//OP80鐨勫湴鍧�
-                //string path = "C:\\Users\\SY-PC\\Desktop\\FO";//OP80鐨勫湴鍧�
-                DateTime? fileFindTime = null;
                 while (true)
                 {
                     threadStatusMonitor.ErrorMsg = "";
@@ -154,7 +151,14 @@
                                     }
                                 }
 
-
+                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅锛屽伐浠剁爜:{wplog.WorkPieceID}");
+                                //鐗规畩澶勭悊OP80 銆怑ditby shaocx,2024-06-15銆�
+                                if (WorkingProcedure.Equals("OP80"))
+                                {
+                                    wplog.GetQcDataFlag = 0;
+                                }
+                                //娉ㄩ噴涓嬮潰鐨勬柟娉曪紝浼樺寲绋嬪簭 銆怑ditby shaocx,2024-06-15銆�
+                                /*
                                 try
                                 {
                                     if (WorkingProcedure.Equals("OP80"))
@@ -334,6 +338,7 @@
                                     threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯革紝璇锋煡鐪嬫棩蹇楋紒";
                                     Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
                                 }
+                                //*/
 
                                 //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
                                 WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));

--
Gitblit v1.9.3