From e8cbb2cb2bda1fb0bb60c7a8f29383fcc73eb76c Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 03 7月 2024 09:32:06 +0800 Subject: [PATCH] 2 --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs index 62b9489..5c7ff34 100644 --- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs +++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs @@ -453,7 +453,7 @@ } op60QualityTime = op60Infos[0].datetimeHandle; - + break; } @@ -609,14 +609,8 @@ } //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby 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琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛� WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure)); threadStatusMonitor.Threadstatue = 1; @@ -874,6 +868,6 @@ } - + } } -- Gitblit v1.9.3