增加 MyRemarks 备注

schangxiang@126.com

2024-09-03 a635f1bbbaf5ebacde78f9d1bcb9b34bc2359902

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs

@@ -14,7 +14,7 @@
    /// <summary>
    ///  SPC推出标记
    /// </summary>
    public class DataCaptureHandler_04: DataCaptureHandler
    public class DataCaptureHandler_04 : DataCaptureHandler
    {
        public static readonly DataCaptureHandler_04 Instance = new DataCaptureHandler_04();

@@ -52,8 +52,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;


@@ -118,11 +119,14 @@
                                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 +148,7 @@
                                    }
                                }

                                if (_dataCaptureConfig.WorkingProcedure.Equals("OP20")|| _dataCaptureConfig.WorkingProcedure.Equals("OP60")
                                if (_dataCaptureConfig.WorkingProcedure.Equals("OP20") || _dataCaptureConfig.WorkingProcedure.Equals("OP60")
                                    )
                                {//op20,op50,op60 会同时推出多件，所以特殊处理
                                    wplog.WorkPieceID = wplog.WorkPieceIDA;
@@ -156,7 +160,7 @@
                                    wplog.WorkPieceID = wplog.WorkPieceIDC;
                                    wplog.Remarks = "SPC推出工件C";
                                    WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
                                    if(_dataCaptureConfig.WorkingProcedure.Equals("OP60"))
                                    if (_dataCaptureConfig.WorkingProcedure.Equals("OP60"))
                                    {
                                        wplog.WorkPieceID = wplog.WorkPieceIDD;
                                        wplog.Remarks = "SPC推出工件D";