//单独处理 质量数据的状态

schangxiang@126.com

2024-08-28 3ea917653766cd8d283b2b222d31bdf0f3615e18

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -154,7 +154,8 @@
            }
        }

        private void Do_One(bool isAdd_WorkPieceInfo, bool isAdd_WorkPieceProcess, bool isAdd_QualityDataInfo, List<FileInfo> allFiles, DbModel db, WorkPieceInfo info, WorkPieceProcess pieceProcess, QualityDataInfo qualityData,
        private void Do_One(bool isAdd_WorkPieceInfo, bool isAdd_WorkPieceProcess, bool isAdd_QualityDataInfo, List<FileInfo> allFiles, DbModel db, WorkPieceInfo info,
            WorkPieceProcess pieceProcess, QualityDataInfo qualityData,
             List<FileInfo> findFiles)
        {
            try
@@ -326,24 +327,28 @@
                //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
                info.OP80NewCode = logMiddle.OP80NewCode;//更新成品吗

                info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                logMiddle.QualityState = info.QualityState;
                //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
                QualityNoOkEnum? qualityNoOkEnum = null;
                QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
                if (qualityNoOkEnum != null)
                //如果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)
                {
                    logMiddle.QualityNoOk = (int)qualityNoOkEnum;
                    logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString();
                    isNeedUpdateQualityState = false;
                }
                //赋值不合格原因
                //TODO:需要配置OP80质量不合格的原因是啥？？
                WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info);
                if (isNeedUpdateQualityState)
                {
                    info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                    logMiddle.QualityState = info.QualityState;
                    //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
                    WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);

                info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
                info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
                info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
                    //赋值不合格原因
                    WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info);

                    info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
                    info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
                    info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();

                }
                //var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == wplog.WorkPieceID).FirstOrDefault();
                //if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
                //{//插入QualityDataInfo表
@@ -353,6 +358,8 @@
                //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的
                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);
                qualityData.EquipmentID = _EquipmentId;
                qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
@@ -378,10 +385,16 @@
                pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
                pieceProcess.GetQcDataFlag_Remark = "找到文件";
                pieceProcess.GetQcDataFlag = 1;
                pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;
                //赋值不合格原因
                //TODO:需要配置OP80质量不合格的原因是啥？？
                WorkPieceInfoManager.SetQualityNoOk_WorkPieceProcess(logMiddle, ref pieceProcess);

                if (isNeedUpdateQualityState)
                {
                    //不再默认赋值为合格 【Editby shaocx,2024-08-16】
                    pieceProcess.QualityState = WorkPieceInfoManager.GetQualityStateValue(info.QualityState);

                    //赋值不合格原因
                    //TODO:需要配置OP80质量不合格的原因是啥？？
                    WorkPieceInfoManager.SetQualityNoOk_WorkPieceProcess(logMiddle, ref pieceProcess);
                }

                pieceProcess.EndTime = file.LastWriteTime;//下线时间改为 文件最后修改时间 【Editby shaocx,2024-06-17】

@@ -513,6 +526,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();