From 2a55eedc9ba903c6a0b9cab8fa5ddc8fee9682aa Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:22:26 +0800
Subject: [PATCH] 显示  [StringLength(50)]         public string DataCapturePointCname { get; set; }

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
index 8efda46..ce93629 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
@@ -15,7 +15,7 @@
     /// <summary>
     /// NOOK鎺ㄥ嚭鏍囪
     /// </summary>
-    public class DataCaptureHandler_03: DataCaptureHandler
+    public class DataCaptureHandler_03 : DataCaptureHandler
     {
         public static readonly DataCaptureHandler_03 Instance = new DataCaptureHandler_03();
 
@@ -53,8 +53,9 @@
                 wplog.EquipmentID = WorkingProcedure;
                 wplog.Remarks = WorkingProcedure;
                 wplog.MonitoringPoint = DataCapturePointCode;
+                //wplog.CreatedUserName = DataCapturePointCode;
+                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
                 wplog.CreatedTime = DateTimeHelper.GetDateTime();
-                wplog.CreatedUserName = DataCapturePointCode;
                 wplog.IsDeleted = false;
 
 
@@ -119,11 +120,13 @@
                                 wplog.WorkingProcedure = WorkingProcedure;
                                 wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
                                 wplog.Remarks = WorkingProcedure;
+
+                                //wplog.WorkPieceID = "123456";
                                 wplog.MonitoringPoint = DataCapturePointCode;
-                                wplog.WorkPieceID = "123456";
+                                //wplog.CreatedUserName = DataCapturePointCode;
+                                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
                                 wplog.CreatedTime = DateTimeHelper.GetDateTime();
-                                wplog.CreatedUserName = DataCapturePointCode;
-                                wplog.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+                                wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
                                 wplog.UpdatedTime = DateTimeHelper.GetDateTime();
                                 wplog.IsDeleted = false;
                                 foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
@@ -144,7 +147,7 @@
                                         Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
                                     }
                                 }
-                                if(_dataCaptureConfig.WorkingProcedure.Equals("OP20")
+                                if (_dataCaptureConfig.WorkingProcedure.Equals("OP20")
                                     //||_dataCaptureConfig.WorkingProcedure.Equals("OP60")
                                     )
                                 {//op20浼氬悓鏃舵帹鍑哄浠讹紝鎵�浠ョ壒娈婂鐞�

--
Gitblit v1.9.3