不合格原因 每句修改

schangxiang@126.com

2024-09-03 3e324486599007039995ee4a27dbda1a4981257e

不合格原因 每句修改

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -691,8 +691,8 @@

                                    if (qualityData.OP30QualityStateCH3 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -705,8 +705,8 @@

                                    if (qualityData.OP30QualityStateCH4 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30预拧紧工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30预拧紧工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30预拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30预拧紧工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -719,8 +719,8 @@

                                    if (qualityData.OP30QualityStateCH5 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30终拧紧工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30终拧紧工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30终拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30终拧紧工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -733,8 +733,8 @@

                                    if (qualityData.OP30QualityStateCH6 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30压衬套工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30压衬套工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30压衬套工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30压衬套工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -2434,10 +2434,10 @@
                //特殊逻辑：按照OP30的顺序判断
                if (logMiddle.QualityNoOk != null && qualityNoOk != null
                    && (
                      qualityNoOk == (int)QualityNoOkEnum.OP30压衬套工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30涨断工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30终拧紧工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30预拧紧工位力矩大
                      qualityNoOk == (int)QualityNoOkEnum.OP30压衬套工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30涨断工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30终拧紧工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30预拧紧工位力矩超差
                    )
                    )
                {
@@ -2726,7 +2726,7 @@
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP35滚压力不合格;
                    qualityNoOkEnum = QualityNoOkEnum.OP35滚压力超差;
                }
                else
                {

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs

@@ -140,7 +140,7 @@
            }
            else if (logMiddle.WorkingProcedureCurrent == "OP35")
            {
                qualityNoOkEnum = QualityNoOkEnum.OP35滚压力不合格;
                qualityNoOkEnum = QualityNoOkEnum.OP35滚压力超差;
                return;
            }
            else if (logMiddle.WorkingProcedureCurrent == "OP40")

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs

@@ -89,14 +89,14 @@

        OP10厚度超差 = 2,
        OP20小头孔直径超差 = 3,
        OP30涨断工位力矩大 = 4,
        OP35滚压力不合格 = 5,
        OP30涨断工位力矩超差 = 4,
        OP35滚压力超差 = 5,
        OP40厚度超差 = 6,
        OP60小头孔直径超差 = 8,
        OP80尺寸超差 = 10,
        OP30预拧紧工位力矩大 = 11,
        OP30终拧紧工位力矩大 = 12,
        OP30压衬套工位力矩大 = 13,
        OP30预拧紧工位力矩超差 = 11,
        OP30终拧紧工位力矩超差 = 12,
        OP30压衬套工位力矩超差 = 13,
        OP60大头孔直径超差 = 14,
        OP80重量超差 = 15,


 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs

@@ -136,8 +136,8 @@
                WorkPieceID = "DZ045L2406240103521TAS",
                UpdatedTime = DateTime.Now,
                QualityState = (int)QualityState.NG,
                QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩大,
                QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩大.ToString(),
                QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩超差,
                QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩超差.ToString(),
                MonitoringPoint = "",
                QualityStateStr = "NG"
            }