2

schangxiang@126.com

2024-06-29 2b6ed5c90044f5e7e18087530e871faeb6e445ee

2

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -2281,6 +2281,89 @@
                }
                return qualityState;
            }
            if (logMiddle.WorkingProcedure == "OP80")
            {
                decimal _QualityOP80_D_TKZJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_D_TKZJ);
                if (!(_QualityOP80_D_TKZJ >= (decimal)53.018 && _QualityOP80_D_TKZJ <= (decimal)53.03))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80大头孔直径超差;
                }

                decimal _QualityOP80_X_TKZJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_X_TKZJ);
                if (!(_QualityOP80_X_TKZJ >= (decimal)22.005 && _QualityOP80_X_TKZJ <= (decimal)22.011))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔直径超差;
                }

                decimal _QualityOP80_ZXJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_ZXJ);
                if (!(_QualityOP80_ZXJ >= (decimal)144.475 && _QualityOP80_ZXJ <= (decimal)144.525))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80中心距超差;
                }

                decimal _QualityOP80_DTKYZD = SystemHelper.GetDecimal(logMiddle.QualityOP80_DTKYZD);
                if (!(_QualityOP80_DTKYZD >= (decimal)0 && _QualityOP80_DTKYZD <= (decimal)0.005))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80大头孔圆柱度超差;
                }

                decimal _QualityOP80_XTSMYD = SystemHelper.GetDecimal(logMiddle.QualityOP80_XTSMYD);
                if (!(_QualityOP80_XTSMYD >= (decimal)0 && _QualityOP80_XTSMYD <= (decimal)0.003))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔圆度上面超差;
                }

                decimal _QualityOP80_XTXMYD = SystemHelper.GetDecimal(logMiddle.QualityOP80_XTXMYD);
                if (!(_QualityOP80_XTXMYD >= (decimal)0 && _QualityOP80_XTXMYD <= (decimal)0.003))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔圆度下面超差;
                }

                decimal _QualityOP80To4 = SystemHelper.GetDecimal(logMiddle.QualityOP80To4);
                if (!(_QualityOP80To4 >= (decimal)0 && _QualityOP80To4 <= (decimal)0.075))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔平行度弯曲超差;
                }

                decimal _QualityOP80To5 = SystemHelper.GetDecimal(logMiddle.QualityOP80To5);
                if (!(_QualityOP80To5 >= (decimal)0 && _QualityOP80To5 <= (decimal)0.2))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔平行度扭曲超差;
                }

                decimal _QualityOP80To6 = SystemHelper.GetDecimal(logMiddle.QualityOP80To6);
                if (!(_QualityOP80To6 >= (decimal)0 && _QualityOP80To6 <= (decimal)0.04))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80大头孔垂直度超差;
                }

                decimal _QualityOP80To10 = SystemHelper.GetDecimal(logMiddle.QualityOP80To10);
                if (!(_QualityOP80To10 >= (decimal)0 && _QualityOP80To10 <= (decimal)0.04))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头孔垂直度超差;
                }

                decimal _QualityOP80_Houdu = SystemHelper.GetDecimal(logMiddle.QualityOP80_Houdu);
                if (!(_QualityOP80_Houdu >= (decimal)21.80 && _QualityOP80_Houdu <= (decimal)21.85))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80厚度超差;
                }

                decimal _QualityOP80To1 = SystemHelper.GetDecimal(logMiddle.QualityOP80To1);
                if (!(_QualityOP80To1 >= (decimal)364 && _QualityOP80To1 <= (decimal)385))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80大头端重量超差;
                }

                decimal _QualityOP80To2 = SystemHelper.GetDecimal(logMiddle.QualityOP80To2);
                if (!(_QualityOP80To2 >= (decimal)143 && _QualityOP80To2 <= (decimal)155))
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP80小头端重量超差;
                }


                return qualityState;
            }
            else if (logMiddle.WorkingProcedure == "OP10")
            {
                if (logMiddle.QualityState == (int)QualityState.NG)

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -328,6 +328,14 @@

                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();
                }
                //赋值不合格原因
                //TODO:需要配置OP80质量不合格的原因是啥？？
                WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info);

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs

@@ -85,7 +85,7 @@
    /// </summary>
    public enum QualityNoOkEnum
    {
  


        OP10厚度超差 = 2,
        OP20小头孔直径超差 = 3,
@@ -99,6 +99,21 @@
        OP30压衬套工位力矩大 = 13,
        OP60大头孔直径超差 = 14,
        OP80重量超差 = 15,

        OP80大头孔直径超差 = 16,
        OP80小头孔直径超差 = 17,
        OP80中心距超差 = 18,
        OP80大头孔圆柱度超差 = 19,
        OP80小头孔圆度上面超差 = 20,
        OP80小头孔圆度下面超差 = 21,
        OP80小头孔平行度扭曲超差 = 22,
        OP80小头孔平行度弯曲超差 = 23,
        OP80大头孔垂直度超差 = 24,
        OP80小头孔垂直度超差 = 25,
        OP80厚度超差 = 26,
        OP80大头端重量超差 = 27,
        OP80小头端重量超差 = 28,

    }

    /// <summary>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs

@@ -260,22 +260,34 @@

        public string QualityOP70To3 { get; set; }


        /// <summary>
        /// 大头重量
        /// </summary>
        public string QualityOP80To1 { get; set; }


        /// <summary>
        /// 小头重量
        /// </summary>
        public string QualityOP80To2 { get; set; }


        /// <summary>
        /// 总重
        /// </summary>
        public string QualityOP80To3 { get; set; }


        /// <summary>
        /// 弯曲
        /// </summary>
        public string QualityOP80To4 { get; set; }


        /// <summary>
        /// 扭度
        /// </summary>
        public string QualityOP80To5 { get; set; }


        /// <summary>
        /// 大头垂直度
        /// </summary>
        public string QualityOP80To6 { get; set; }


@@ -286,6 +298,9 @@


        public string QualityOP80To9 { get; set; }
        /// <summary>
        /// 小头垂直度
        /// </summary>
        public string QualityOP80To10 { get; set; }