From 97eb1b2a4f11ce60fda7a47ac1edfa588faf22eb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 14:28:41 +0800
Subject: [PATCH] //单独处理 质量数据的状态

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index eb57a17..f0a827f 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -359,12 +359,21 @@
                 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//鎸囧畾淇敼瀛楁
 
                 //鍗曠嫭澶勭悊 璐ㄩ噺鏁版嵁鐨勭姸鎬�
-                qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+                if (isNeedUpdateQualityState)
+                {
+                    qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+                }
+                else
+                {//蹇呯劧鏄笉鍚堟牸
+                    qualityData.QualityState = (int)(QualityState.NG);
+                }
+                qualityData.OP80QualityState = qualityData.QualityState.ToString();
+
                 qualityData.EquipmentID = _EquipmentId;
                 qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                 qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
                 qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
-                qualityData.OP80QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
+
                 qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime();
                 qualityData.OP80QualityFilePath = logMiddle.OP80QualityFilePath;
                 long op80id = qualityData.Id;

--
Gitblit v1.9.3