增加 JiaJuGongWei

schangxiang@126.com

2024-09-11 dfbe7cb2992df2d4195b12026d1f9e0a7423460e

 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;

@@ -184,6 +185,8 @@

                WorkPieceLog loginfo2 = new WorkPieceLog();
                loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(logMiddle);
                loginfo2.DataCapturePointCname = "OP80质量采集";
                loginfo2.CreatedUserName = loginfo2.MonitoringPoint;

                var datatable = CSVHelper.ReadCSVList(file.FullName);
                List<string> rowFirst = new List<string>();
@@ -331,13 +334,13 @@
                //如果OP80下线，已经更改了质检状态，并且质检状态等于不合格，则这里就不要继续更改质检状态了 【Editby shaocx,2024-08-28】
                bool isNeedUpdateQualityState = true;
                var ooDateTime = Convert.ToDateTime("0001-01-01");
                if (pieceProcess.EndTime != ooDateTime && pieceProcess.QualityState == (int)QualityState.NG)
                if (pieceProcess.EndTime != ooDateTime && pieceProcess.QualityState == (int)QualityStateEnum.NG)
                {
                    isNeedUpdateQualityState = false;
                }
                if (isNeedUpdateQualityState)
                {
                    info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                    info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
                    logMiddle.QualityState = info.QualityState;
                    //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
                    WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
@@ -362,11 +365,11 @@
                //单独处理 质量数据的状态
                if (isNeedUpdateQualityState)
                {
                    qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                    qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
                }
                else
                {//必然是不合格
                    qualityData.QualityState = (int)(QualityState.NG);
                    qualityData.QualityState = (int)(QualityStateEnum.NG);
                }
                qualityData.OP80QualityState = qualityData.QualityState.ToString();

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

@@ -542,6 +546,7 @@
                        process.StartTime = DateTimeHelper.GetDateTime();
                        process.EndTime = file.LastWriteTime;
                        process.CreatedUserName = _DataCapturePointCode;
                        process.JiaJuGongWei = "";
                        process.DataCapturePointCname = DataCapturePointCname;
                        process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.UpdatedUserName = _DataCapturePointCode;