From a3e2b38a895b32ac08bb4acf18a4e57f65651c4a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 18 8月 2024 08:14:51 +0800
Subject: [PATCH] 清洗机获取采集数据
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 2ab81ea..1a242ae 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -329,13 +329,8 @@
info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
logMiddle.QualityState = info.QualityState;
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby 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();
- }
+ WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
+
//璧嬪�间笉鍚堟牸鍘熷洜
//TODO:闇�瑕侀厤缃甇P80璐ㄩ噺涓嶅悎鏍肩殑鍘熷洜鏄暐锛燂紵
WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info);
@@ -378,7 +373,11 @@
pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
pieceProcess.GetQcDataFlag_Remark = "鎵惧埌鏂囦欢";
pieceProcess.GetQcDataFlag = 1;
- pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;
+
+ //涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
+ //pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;//榛樿鍚堟牸锛屽凡澶勭悊
+ pieceProcess.QualityState = WorkPieceInfoManager.GetQualityStateValue(info.QualityState);
+
//璧嬪�间笉鍚堟牸鍘熷洜
//TODO:闇�瑕侀厤缃甇P80璐ㄩ噺涓嶅悎鏍肩殑鍘熷洜鏄暐锛燂紵
WorkPieceInfoManager.SetQualityNoOk_WorkPieceProcess(logMiddle, ref pieceProcess);
--
Gitblit v1.9.3