整理代码

schangxiang@126.com

2024-09-06 05f2a20bb792169bf7b8a101af8718b96449f55a

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs

@@ -1,4 +1,5 @@
using iWare_SCADA_BusinessLogical.BLL;
using iWare_SCADA_BusinessLogical.BLL.Important;
using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using System;
@@ -13,7 +14,7 @@
    /// <summary>
    /// OP10/OP40推出标记 
    /// </summary>
    public class DataCaptureHandler_OP1004: DataCaptureHandler
    public class DataCaptureHandler_OP1004 : DataCaptureHandler
    {
        public static readonly DataCaptureHandler_OP1004 Instance = new DataCaptureHandler_OP1004();

@@ -94,10 +95,11 @@
                                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.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString();
                                wplog.OnlineTime = DateTimeHelper.GetDateTime();
                                wplog.IsDeleted = false;

@@ -128,17 +130,17 @@
                                {
                                    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.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);
                                    wplog.Remarks = (wplog.Remarks ?? "") + $"推出原因[{wplog.OP10Flag}]   SPC";
                                    WorkPieceSPCPushOffManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
                                    wplog.Remarks = $"推出原因[{wplog.OP10Flag}]   SPC";
                                    threadStatusMonitor.Threadstatue = 1;
                                }

@@ -154,7 +156,7 @@
                        SystemValue.lbl_Alert_OP1004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
                        if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
                        {
                            Thread.Sleep(5000);
                            Thread.Sleep(1000);
                        }
                        else
                        {