222

schangxiang@126.com

2024-07-03 1b57ab89964f191e3986921270f58eb5bf34d954

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs

@@ -306,11 +306,11 @@
                                                    logMiddle.QualityOP30To1 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//涨断力矩
                                                    break;
                                                case "OP3002CH4":
                                                    logMiddle = GetCH4Info(files[0].FullName, logMiddle);
                                                    logMiddle = GetCH4InfoForOP30(files[0].FullName, logMiddle);
                                                    logMiddle.OP30QualityFilePathCH4 = files[0].FullName;
                                                    break;
                                                case "OP3002CH5":
                                                    logMiddle = GetCH5Info(files[0].FullName, logMiddle);
                                                    logMiddle = GetCH5InfoForOP30(files[0].FullName, logMiddle);
                                                    logMiddle.OP30QualityFilePathCH5 = files[0].FullName;
                                                    break;
                                                case "OP3002CH6":
@@ -330,10 +330,12 @@
                                        if (logMiddle.OP35OK)
                                        {
                                            logMiddle.QualityStateStr = "OK";
                                            logMiddle.QualityState = (int)QualityState.OK;
                                        }
                                        else
                                        {
                                            logMiddle.QualityStateStr = "NG";
                                            logMiddle.QualityState = (int)QualityState.NG;
                                        }
                                    }
                                    else if (WorkingProcedure.Equals("OP60"))
@@ -453,7 +455,7 @@
                                                        }
                                                        op60QualityTime = op60Infos[0].datetimeHandle;

                                                       


                                                        break;
                                                    }
@@ -609,14 +611,8 @@
                                }

                                //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
                                QualityNoOkEnum? qualityNoOkEnum = null;
                                QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
                                logMiddle.QualityState = (int)qualityState;
                                if (qualityNoOkEnum != null)
                                {
                                    logMiddle.QualityNoOk = (int)qualityNoOkEnum;
                                    logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString();
                                }
                                WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
                              
                                //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
                                WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
                                threadStatusMonitor.Threadstatue = 1;
@@ -716,7 +712,7 @@
            }
        }

        public WorkPieceLogMiddle GetCH4Info(string FullName, WorkPieceLogMiddle wplog)
        public WorkPieceLogMiddle GetCH4InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
        {
            try
            {
@@ -780,7 +776,7 @@

        }

        public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
        public WorkPieceLogMiddle GetCH5InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
        {
            try
            {
@@ -874,6 +870,6 @@
        }


  

    }
}