From 953bc88c74023afffc12505635a22e84d9964c9c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 9月 2024 11:06:28 +0800
Subject: [PATCH] NOOK时,也要 新建 工序

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs |   12 ++++++++----
 1 files changed, 8 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 024a265..c1f4a6f 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
@@ -145,8 +145,9 @@
                                 wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
                                 wplog.Remarks = WorkingProcedure;
                                 wplog.MonitoringPoint = DataCapturePointCode;
+                                //wplog.CreatedUserName = DataCapturePointCode;
+                                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
                                 wplog.CreatedTime = DateTimeHelper.GetDateTime();
-                                wplog.CreatedUserName = DataCapturePointCode;
                                 wplog.UpdatedTime = DateTimeHelper.GetDateTime();
                                 wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
                                 wplog.OnlineTime = DateTimeHelper.GetDateTime();
@@ -173,11 +174,14 @@
 
                                 //鐩戞帶娴嬭瘯鏁版嵁锛屾ā鎷燂紝娴嬭瘯
                                 MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
+                                //鐩戞帶涓婄嚎
+                                MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
 
                                 //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
                                 string sideValue = GetSideForOP50(plcService, wplog);
                                 wplog.MonitoringPoint += sideValue;
-                                wplog.CreatedUserName = wplog.MonitoringPoint;
+                                //wplog.CreatedUserName = wplog.MonitoringPoint;
+                                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
 
                                 //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
                                 WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
@@ -191,8 +195,8 @@
                         threadStatusMonitor.Remarks = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
                         if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
                         {
-                            threadStatusMonitor.ThreadFrequency = 5000;
-                            Thread.Sleep(5000);
+                            threadStatusMonitor.ThreadFrequency = 1000;
+                            Thread.Sleep(1000);
                         }
                         else
                         {

--
Gitblit v1.9.3