2

schangxiang@126.com

2024-08-23 9ef76a4a6f0cb9b9d24ae9faf3d1edac9afbc0fa

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -329,13 +329,8 @@
                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)
                {
                    logMiddle.QualityNoOk = (int)qualityNoOkEnum;
                    logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString();
                }
                WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);

                //赋值不合格原因
                //TODO:需要配置OP80质量不合格的原因是啥？？
                WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info);
@@ -378,7 +373,11 @@
                pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
                pieceProcess.GetQcDataFlag_Remark = "找到文件";
                pieceProcess.GetQcDataFlag = 1;
                pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;

                //不再默认赋值为合格 【Editby shaocx,2024-08-16】
                //pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;//默认合格，已处理
                pieceProcess.QualityState = WorkPieceInfoManager.GetQualityStateValue(info.QualityState);

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