2

schangxiang@126.com

2024-08-31 fccac00b2ffed83a2a04dd3d32246f21c841a38b

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -320,7 +320,7 @@
                }
                else
                {
                    logMiddle.Remarks = (logMiddle.Remarks ?? "") + $"OP80下线完成读取文件{file.FullName}异常，行数不是2行";
                    logMiddle.Remarks = $"OP80下线完成读取文件{file.FullName}异常，行数不是2行";
                }


@@ -358,11 +358,22 @@
                //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的
                EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段

                //单独处理 质量数据的状态
                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;
@@ -370,7 +381,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}工序质量采集数据不合格";
@@ -524,6 +535,7 @@
                        isAdd_WorkPieceProcess = true;
                        process = new WorkPieceProcess();
                        process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
                        QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
                        process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                        process.WorkingProcedureCurrent = query_WorkingProcedureCurrent;
                        process.StartTime = DateTimeHelper.GetDateTime();