优化OP80 质量状态

schangxiang@126.com

2024-09-05 8e7cedac32ff2f3b73a9a832fc195311f05962fe

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -178,13 +178,13 @@
                            //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
                            if (!loginfo.WorkingProcedure.Equals("OP05"))
                            {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态
                                info.QualityState = (int)QualityState.Suspected;
                                info.QualityState = (int)QualityStateEnum.Suspected;
                                info.QualityErrorInfo = $"工件二维码第一次出现的工序{loginfo.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                info.Remarks = $"工件二维码第一次出现的工序{loginfo.WorkingProcedure}不是OP05,数据缺失,请确认情况并做相应处理！";
                            }
                            else
                            {
                                info.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                info.QualityState = (int)QualityStateEnum.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                info.Remarks = "OP05新增工件信息";
                            }
                            info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
@@ -237,6 +237,15 @@
                                pro.Remarks = "又一次上线，更新结束时间";
                            }
                        }
                        //特殊处理OP05上线，因为他是根据文本列表内容上线的 【Editby shaocx,2024-09-03】
                        if (loginfo.WorkingProcedure.Equals("OP05"))
                        {
                            var op05Proccss = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure).FirstOrDefault();
                            if (op05Proccss != null)
                            {
                                isNeedAddNewProcess = false;//不需要新增了
                            }
                        }
                        if (isNeedAddNewProcess)
                        {
                            //每次扫描上线都插入追溯表
@@ -251,7 +260,7 @@

                            if (new_process.WorkingProcedureCurrent == WorkingProcedureForHMI.OP70.ToString())
                            { //特殊处理OP70，因为OP70没有测量，默认合格 [Editby shaocx,2024-07-03]
                                new_process.QualityState = (int)QualityState.OK;//默认合格，OP70默认是合格
                                new_process.QualityState = (int)QualityStateEnum.OK;//默认合格，OP70默认是合格
                            }

                            new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -263,6 +272,7 @@
                            new_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            new_process.OperationType = OperationType.生产.ToString();
                            new_process.Remarks = "";
                            new_process.MyRemarks = "读码上线时，每次扫描上线都插入追溯表";
                            if (loginfo.WorkingProcedure.Equals("OP05"))
                            {
                                new_process.EndTime = new_process.StartTime;
@@ -288,11 +298,11 @@
                            string message = "";
                            checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, loginfo, type);

                            if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
                            if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityStateEnum.OK)
                            {
                                plcFlag = false;
                                message = !checkQualityInfoCompleteFlag ? "跳序，" : "";
                                message += info.QualityState != (int)QualityState.OK ? "质量不符合" : "";
                                message += info.QualityState != (int)QualityStateEnum.OK ? "质量不符合" : "";
                            }
                            ////反馈给PLC，（写入点待定）
                            //MessageModel fr = null;
@@ -543,13 +553,13 @@
                                //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
                                if (!logMiddle.WorkingProcedure.Equals("OP05"))
                                {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态
                                    pieceInfo.QualityState = (int)QualityState.Suspected;
                                    pieceInfo.QualityState = (int)QualityStateEnum.Suspected;
                                    pieceInfo.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                    pieceInfo.Remarks = $"工件二维码第一次出现的工序{logMiddle.WorkingProcedure}不是OP05,数据缺失,请确认情况并做相应处理！";
                                }
                                else
                                {
                                    pieceInfo.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                    pieceInfo.QualityState = (int)QualityStateEnum.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                    pieceInfo.Remarks = "OP05新增工件信息";
                                }
                                pieceInfo.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
@@ -627,12 +637,12 @@
                        {//工序开始时间没有则赋值
                            pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
                        }
                        pieceInfo.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                        pieceInfo.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
                        //赋值不合格原因
                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);


                        if (!pieceInfo.QualityState.Equals(((int)QualityState.OK).ToString()))
                        if (!pieceInfo.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
                        {
                            pieceInfo.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格{pieceInfo.QualityState}";
                        }
@@ -689,7 +699,7 @@
                                    qualityData.OP30QualityStateCH3 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                                    qualityData.OP30QualityReceiveTimeCH3 = DateTimeHelper.GetDateTime();

                                    if (qualityData.OP30QualityStateCH3 == ((int)QualityState.NG).ToString())
                                    if (qualityData.OP30QualityStateCH3 == ((int)QualityStateEnum.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩超差.ToString();
@@ -703,7 +713,7 @@
                                    qualityData.OP30QualityStateCH4 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                                    qualityData.OP30QualityReceiveTimeCH4 = DateTimeHelper.GetDateTime();

                                    if (qualityData.OP30QualityStateCH4 == ((int)QualityState.NG).ToString())
                                    if (qualityData.OP30QualityStateCH4 == ((int)QualityStateEnum.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30预拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30预拧紧工位力矩超差.ToString();
@@ -717,7 +727,7 @@
                                    qualityData.OP30QualityStateCH5 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                                    qualityData.OP30QualityReceiveTimeCH5 = DateTimeHelper.GetDateTime();

                                    if (qualityData.OP30QualityStateCH5 == ((int)QualityState.NG).ToString())
                                    if (qualityData.OP30QualityStateCH5 == ((int)QualityStateEnum.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30终拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30终拧紧工位力矩超差.ToString();
@@ -731,7 +741,7 @@
                                    qualityData.OP30QualityStateCH6 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                                    qualityData.OP30QualityReceiveTimeCH6 = DateTimeHelper.GetDateTime();

                                    if (qualityData.OP30QualityStateCH6 == ((int)QualityState.NG).ToString())
                                    if (qualityData.OP30QualityStateCH6 == ((int)QualityStateEnum.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30压衬套工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30压衬套工位力矩超差.ToString();
@@ -808,6 +818,7 @@
                            process.OperationType = OperationType.生产.ToString();
                            process.QualityDataInfoID = qualityData.Id;
                            process.Remarks = "";
                            process.MyRemarks = "质量检测完成时，如果找不到就新建";
                            db.WorkPieceProcess.Add(process);
                        }
                        else
@@ -834,7 +845,7 @@

                        if (logMiddle.QualityType != null && logMiddle.QualityType.Equals(QualityType.SPC.ToString()))
                        {//SPC反馈，
                            if (logMiddle.QualityState != (int)QualityState.OK)
                            if (logMiddle.QualityState != (int)QualityStateEnum.OK)
                            {
                                //当某到工序检测到不合格工件时，从该工件加工完成时刻前指定时间起至报检不合格时间止，系统将该工件的最后加工工序在该时间段内加工的所有工件、正在加工的工件、该工序入口处的第一个工件全部标记为疑似状态，由人工复检工件并修改状态，并支持批量变更。
                                //答复：在线测量不需要走这个流程，只有SPC抽检才需要，需要把这时间段的工件全部置为疑似，哪怕是已完成工件
@@ -1023,8 +1034,8 @@
                        if (loginfo.WorkingProcedure.Equals("OP35"))
                        {//为了解决OP35的采集到的质量信息是OK还NOOK的情况，OP35 NOOK时更新质量信息
                            loginfo2.Remarks = $"OP35NOOK原质量信息{(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "空")}";
                            cur_db_info.QualityState = (int)QualityState.NG;
                            if (!cur_db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
                            cur_db_info.QualityState = (int)QualityStateEnum.NG;
                            if (!cur_db_info.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
                            {
                                cur_db_info.QualityErrorInfo = $"{loginfo.WorkingProcedure}工序质量NOOK采集数据不合格{cur_db_info.QualityState}";
                            }
@@ -1043,14 +1054,37 @@
                            }
                        }
                        //更新上一工序的结束时间
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID
                        && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        if (pro != null && pro.WorkPieceID.Length > 0)
                        {
                            pro.EndTime = DateTimeHelper.GetDateTime();
                            pro.Remarks = (pro.Remarks ?? "") + "NOOK结束";
                            pro.Remarks = "NOOK结束";
                            pro.UpdatedUserName = loginfo.MonitoringPoint;
                            pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                            pro.UpdatedTime = DateTimeHelper.GetDateTime();
                        }
                        else
                        {//如果找不到就新建 【Editby shaocx,2024-09-03】
                            WorkPieceProcess add_process = new WorkPieceProcess();
                            add_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(cur_db_info);
                            QualityStateHelper.ResetQualityNoOkForNewProcess(ref add_process);
                            add_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            add_process.StartTime = DateTimeHelper.GetDateTime().AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(loginfo.WorkingProcedure));
                            add_process.EndTime = DateTimeHelper.GetDateTime();
                            //不再默认赋值为合格 【Editby shaocx,2024-08-16】
                            add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(loginfo.QualityState);

                            add_process.CreatedUserName = loginfo.MonitoringPoint;
                            add_process.DataCapturePointCname = loginfo.DataCapturePointCname;
                            add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.UpdatedUserName = loginfo.MonitoringPoint;
                            add_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                            add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.OperationType = OperationType.生产.ToString();
                            add_process.Remarks = "NOOK结束";
                            add_process.MyRemarks = "NOOK结束时，如果找不到就新建";
                            db.WorkPieceProcess.Add(add_process);
                        }

                        QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData);
@@ -1159,7 +1193,7 @@
                        QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
                        process.StartTime = DateTimeHelper.GetDateTime();
                        process.OperationType = OperationType.SPC.ToString();
                        process.QualityState = (int)QualityState.Suspected;
                        process.QualityState = (int)QualityStateEnum.Suspected;
                        process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                        process.CreatedUserName = loginfo.MonitoringPoint;
                        process.DataCapturePointCname = loginfo.DataCapturePointCname;
@@ -1168,6 +1202,7 @@
                        process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                        process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.Remarks = "工件SPC抽检推出";
                        process.MyRemarks = "SPC时，插入追溯表";
                        db.WorkPieceProcess.Add(process);


@@ -1234,7 +1269,7 @@
            {
                if (logMiddle.WorkingProcedure.Equals("OP70"))
                {
                    logMiddle.QualityState = (int)QualityState.OK; //如果是OP70，则默认是合格 【Editby shaocx,2024-06-25】
                    logMiddle.QualityState = (int)QualityStateEnum.OK; //如果是OP70，则默认是合格 【Editby shaocx,2024-06-25】
                }

                WorkPieceLog loginfo2 = new WorkPieceLog();
@@ -1259,13 +1294,13 @@
                            //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
                            if (!logMiddle.WorkingProcedure.Equals("OP05"))
                            {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态
                                db_info.QualityState = (int)QualityState.Suspected;
                                db_info.QualityState = (int)QualityStateEnum.Suspected;
                                db_info.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                db_info.Remarks = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                            }
                            else
                            {
                                db_info.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                db_info.QualityState = (int)QualityStateEnum.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                db_info.Remarks = "OP05新增工件信息";
                            }
                            db_info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime
@@ -1344,11 +1379,13 @@
                                info.QualityErrorInfo = "";
                            }
                            //*/

                            loginfo2.Remarks = $"测量合格状态:{logMiddle.St3_Means_OK},称重状态:{logMiddle.St4_Weight_OK}";
                        }
                        else if (logMiddle.WorkingProcedure.Equals("OP30"))
                        {

                            db_info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                            db_info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
                            logMiddle.QualityState = db_info.QualityState;
                            db_info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
                            db_info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
@@ -1366,7 +1403,7 @@
                            qualityData.OP30QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                            qualityData.OP30QualityReceiveTime = DateTimeHelper.GetDateTime();
                            loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}";
                            if (!db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
                            if (!db_info.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
                            {
                                db_info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格";
                            }
@@ -1421,6 +1458,7 @@
                            add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.OperationType = OperationType.生产.ToString();
                            add_process.Remarks = "";
                            add_process.MyRemarks = "工序完成时，如果找不到就新建";
                            if (logMiddle.WorkingProcedure.Equals("OP80"))
                            {
                                add_process.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]
@@ -2541,11 +2579,11 @@
        public static void SetLogMiddleForQuality(ref WorkPieceLogMiddle logMiddle)
        {

            logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
            logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);

            //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
            QualityNoOkEnum? qualityNoOkEnum = null;
            QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
            QualityStateEnum qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
            logMiddle.QualityState = (int)qualityState;
            logMiddle.QualityStateStr = qualityState.ToString();
            if (qualityNoOkEnum != null)
@@ -2558,9 +2596,9 @@
        /// <summary>
        /// 计算OP 质量数据是否合格
        /// </summary>
        private static QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
        private static QualityStateEnum CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
        {
            QualityState qualityState = QualityState.Suspected;
            QualityStateEnum qualityState = QualityStateEnum.Suspected;
            if (logMiddle.WorkingProcedure == "OP60")
            {//合格/不合格由 WMS自行判断
                decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1);
@@ -2588,24 +2626,24 @@

                if (isPass_QualityOP60To1 && isPass_QualityOP60To2)
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                else
                {
                    qualityState = QualityState.NG;
                    qualityState = QualityStateEnum.NG;
                }
                if (_QualityOP60To1 == 0 || _QualityOP60To2 == 0)
                {
                    qualityState = QualityState.Suspected;
                    qualityState = QualityStateEnum.Suspected;
                    return qualityState;
                }
                return qualityState;
            }
            else if (logMiddle.WorkingProcedure == "OP80")
            {//合格/不合格由 OP80 判断，QualityState 和 QualityStateStr 都在调用当前方法前 写入值了
                if (logMiddle.QualityState == (int)QualityState.OK)
                if (logMiddle.QualityState == (int)QualityStateEnum.OK)
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                    return qualityState;
                }

@@ -2692,25 +2730,25 @@
            }
            else if (logMiddle.WorkingProcedure == "OP10")
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                if (logMiddle.QualityState == (int)QualityStateEnum.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP10厚度超差;
                }
                else
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                return qualityState;
            }
            else if (logMiddle.WorkingProcedure == "OP20")
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                if (logMiddle.QualityState == (int)QualityStateEnum.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP20小头孔直径超差;
                }
                else
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                return qualityState;
            }
@@ -2718,35 +2756,35 @@
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityStateStr.Equals("OK"))
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                else
                {
                    qualityState = QualityState.NG;
                    qualityState = QualityStateEnum.NG;
                }
                return qualityState;
            }
            else if (logMiddle.WorkingProcedure == "OP35")
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                if (logMiddle.QualityState == (int)QualityStateEnum.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP35滚压力超差;
                }
                else
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                return qualityState;
            }
            else if (logMiddle.WorkingProcedure == "OP40")
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                if (logMiddle.QualityState == (int)QualityStateEnum.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP40厚度超差;
                }
                else
                {
                    qualityState = QualityState.OK;
                    qualityState = QualityStateEnum.OK;
                }
                return qualityState;
            }
@@ -2763,17 +2801,17 @@
        {
            if (qualityState.HasValue == false)
            {
                return (int)QualityState.Suspected;
                return (int)QualityStateEnum.Suspected;
            }
            if (qualityState.Value == 1)
            {
                return (int)QualityState.OK;
                return (int)QualityStateEnum.OK;
            }
            if (qualityState.Value == 2)
            {
                return (int)QualityState.NG;
                return (int)QualityStateEnum.NG;
            }
            return (int)QualityState.Suspected;
            return (int)QualityStateEnum.Suspected;
        }