2

schangxiang@126.com

2024-09-02 5834c3175122fd0fb9665f7cccae1601e47dc423

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -28,6 +28,7 @@
        public static readonly string path = ConfigHelper.GetConfigString("OP80QualityData");//OP80的地址
        public static readonly string query_WorkingProcedureCurrent = "OP80";
        public static readonly string _DataCapturePointCode = "OP8002";
        public static readonly string _DataCapturePointName = "OP80质量数据采集";
        public static readonly string _EquipmentId = "EOP80";
        public static readonly LogType logType = LogType.PLCOP80_QC;

@@ -175,8 +176,9 @@
                logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
                logMiddle.Remarks = logMiddle.WorkingProcedure;
                logMiddle.MonitoringPoint = _DataCapturePointCode;
                //logMiddle.CreatedUserName = _DataCapturePointCode;
                SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
                logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
                logMiddle.CreatedUserName = _DataCapturePointCode;
                logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
                logMiddle.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString();
                logMiddle.IsDeleted = false;
@@ -320,7 +322,7 @@
                }
                else
                {
                    logMiddle.Remarks = (logMiddle.Remarks ?? "") + $"OP80下线完成读取文件{file.FullName}异常，行数不是2行";
                    logMiddle.Remarks = $"OP80下线完成读取文件{file.FullName}异常，行数不是2行";
                }


@@ -359,12 +361,21 @@
                EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段

                //单独处理 质量数据的状态
                qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                if (isNeedUpdateQualityState)
                {
                    qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                }
                else
                {//必然是不合格
                    qualityData.QualityState = (int)(QualityState.NG);
                }
                qualityData.OP80QualityState = qualityData.QualityState.ToString();

                qualityData.EquipmentID = _EquipmentId;
                qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
                qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
                qualityData.OP80QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";

                qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime();
                qualityData.OP80QualityFilePath = logMiddle.OP80QualityFilePath;
                long op80id = qualityData.Id;
@@ -372,7 +383,7 @@
                {
                    pieceProcess.QualityDataInfoID = op80id;
                }
                loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}";
                loginfo2.Remarks = $"质量：{logMiddle.QualityStateStr ?? "空"}";
                if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
                {
                    info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格";
@@ -501,7 +512,8 @@
                            WorkingProcedureCurrent = query_WorkingProcedureCurrent,
                            EquipmentID = _EquipmentId,
                            CreatedTime = DateTime.Now,
                            CreatedUserName = _DataCapturePointCode
                            CreatedUserName = _DataCapturePointCode,
                            DataCapturePointCname= _DataCapturePointName
                        };
                    }

@@ -532,8 +544,10 @@
                        process.StartTime = DateTimeHelper.GetDateTime();
                        process.EndTime = file.LastWriteTime;
                        process.CreatedUserName = _DataCapturePointCode;
                        process.DataCapturePointCname = DataCapturePointCname;
                        process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.UpdatedUserName = _DataCapturePointCode;
                        process.UpdateDataCapturePointCname = DataCapturePointCname;
                        process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.OperationType = OperationType.生产.ToString();
                        process.Remarks = "";