From 09a12e1094e90fe83c5578de64b56e9237c60507 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:13:33 +0800
Subject: [PATCH] 代码回归

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
index ea0b238..8a2a57a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -106,7 +106,7 @@
                     //plcService.Close();
                     //plcService.OpenService();
                 }
-                string value_01 = "";
+                string value_01 = "";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
                 while (true)
                 {
                     threadStatusMonitor.ErrorMsg = "";
@@ -135,7 +135,9 @@
 
                             object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
                             WorkPieceLog wplog = null;
-                            if (value.ToString().ToUpper().Equals("TRUE"))
+
+                            var value_bool = value.ToString().ToUpper().Equals("TRUE");
+                            if (value_bool)
                             {
                                 wplog = new WorkPieceLog();
                                 wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -175,6 +177,12 @@
                                 //鐩戞帶涓婄嚎
                                 MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
                             }
+                            //if (wplog != null)
+                            //{
+                            //    var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+                            //    if (isRight)
+                            //    {
+                            #region 澶勭悊涓氬姟
 
                             if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
                             {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
@@ -196,12 +204,15 @@
                             }
                             value_01 = value.ToString();
 
+                            #endregion
+                            //    }
+                            //}
                         }
                         threadStatusMonitor.Remarks = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
                         if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
                         {
-                            threadStatusMonitor.ThreadFrequency = 1000;
-                            Thread.Sleep(1000);
+                            threadStatusMonitor.ThreadFrequency = 700;
+                            Thread.Sleep(700);
                         }
                         else
                         {

--
Gitblit v1.9.3