From 05f2a20bb792169bf7b8a101af8718b96449f55a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 9月 2024 16:11:33 +0800
Subject: [PATCH] 整理代码

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs
index b69fde6..c5bb9b6 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.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 System;
@@ -94,8 +95,9 @@
                                 wplog.WorkingProcedure = WorkingProcedure;
                                 wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
                                 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();
@@ -128,16 +130,16 @@
                                 {
                                     Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭1鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
 
-                                    WorkPieceInfoManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
+                                    WorkPiecePushOffManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
                                     threadStatusMonitor.Threadstatue = 1;
-                                    wplog.Remarks =$"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]   NOOK";
+                                    wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]   NOOK";
                                 }
                                 //else if (wplog.OP10Flag == 2 || wplog.OP10Flag == 3)
                                 else
                                 {
                                     Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭23鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
 
-                                    WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
+                                    WorkPieceSPCPushOffManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
                                     wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]   SPC";
                                     threadStatusMonitor.Threadstatue = 1;
                                 }

--
Gitblit v1.9.3