From cd800c7163ae98de4ce9ddf2e4e20a8c3be1f96a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 09:26:15 +0800
Subject: [PATCH] 移除数据

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs
index ba60c26..7d8db1f 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.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;
@@ -47,6 +48,7 @@
         {
             if (SystemValue.isStartedImitateModel)
             {
+                /*
                 var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
                 WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
                 wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -54,8 +56,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;
 
 
@@ -64,8 +67,9 @@
                 wplog.UpdatedTime = DateTimeHelper.GetDateTime();
                 wplog.UpdatedUserName = DataCapturePointCode;
                 //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-                WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+                WorkPiecePushOffManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
 
+                //*/
                 return;
             }
             Dictionary<bool, DateTime> fullBeatDic = new Dictionary<bool, DateTime>();//FullMaterial  鍫垫枡  10绉抐alse绠楀牭鏂�
@@ -122,12 +126,13 @@
                             WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
                             wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                             wplog.WorkingProcedure = WorkingProcedure;
-                            wplog.EquipmentID = _dataCaptureConfig.EquipmentID;;
+                            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.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
                             wplog.OnlineTime = DateTimeHelper.GetDateTime();
                             wplog.IsDeleted = false;
 
@@ -158,7 +163,7 @@
                             //{//璇存槑鍛婅淇℃伅鏁版嵁鍙戠敓鍙樻洿
                             //    wplog.ischeckMessageStatus = true;
                             //}
-                            if(wplog.WorkingProcedure.Equals("OP05"))
+                            if (wplog.WorkingProcedure.Equals("OP05"))
                             {
                                 if (fullBeatMonitorflag != wplog.FullMaterial)
                                 {//鍫垫枡蹇冭烦鍙樺寲

--
Gitblit v1.9.3