From c34f8f93417c5a0125f9c55ba3d347411995ac13 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 15:05:32 +0800
Subject: [PATCH] 1

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs |   63 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 29 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 8a2a57a..70f6736 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
@@ -1,4 +1,5 @@
 锘縰sing iWare_SCADA_BusinessLogical.BLL;
+using iWare_SCADA_BusinessLogical.BLL.Important;
 using iWare_SCADA_BusinessLogical.Utils;
 using iWare_SCADA_Model;
 using iWare_SCADA_Model.MiddleModel;
@@ -106,7 +107,7 @@
                     //plcService.Close();
                     //plcService.OpenService();
                 }
-                string value_01 = "";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
+                string value_01 = "FALSE";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
                 while (true)
                 {
                     threadStatusMonitor.ErrorMsg = "";
@@ -177,36 +178,40 @@
                                 //鐩戞帶涓婄嚎
                                 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鏃讹紝
-                             //瑙﹀彂鎿嶄綔,  骞剁粰闈欐�佸彉閲忚祴鍊间负1
-                             //涓氬姟浠g爜
-                                threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
-
-                                //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
-                                string sideValue = GetSideForOP50(plcService, wplog);
-                                wplog.MonitoringPoint += sideValue;
-                                //wplog.CreatedUserName = wplog.MonitoringPoint;
-                                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
-
-                                //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
-                                WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
-
-                                threadStatusMonitor.Threadstatue = 1;
-
+                            else
+                            {
+                                value_01 = value.ToString();
                             }
-                            value_01 = value.ToString();
+                            if (wplog != null)
+                            {
+                                var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+                                if (isRight)
+                                {
+                                    #region 澶勭悊涓氬姟
 
-                            #endregion
-                            //    }
-                            //}
+                                    if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+                                    {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+                                     //瑙﹀彂鎿嶄綔,  骞剁粰闈欐�佸彉閲忚祴鍊间负1
+                                     //涓氬姟浠g爜
+                                        threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+
+                                        //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
+                                        string sideValue = GetSideForOP50(plcService, wplog);
+                                        wplog.MonitoringPoint += sideValue;
+                                        //wplog.CreatedUserName = wplog.MonitoringPoint;
+                                        SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
+
+                                        //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+                                        ReadQRcodeManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+
+                                        threadStatusMonitor.Threadstatue = 1;
+
+                                    }
+                                    value_01 = value.ToString();
+
+                                    #endregion
+                                }
+                            }
                         }
                         threadStatusMonitor.Remarks = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
                         if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)

--
Gitblit v1.9.3