From 8e7cedac32ff2f3b73a9a832fc195311f05962fe Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 10:44:34 +0800
Subject: [PATCH] 优化OP80 质量状态
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 2 ++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 2 ++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs | 11 +++++++++++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index 28af33d..8ebde78 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1379,6 +1379,8 @@
info.QualityErrorInfo = "";
}
//*/
+
+ loginfo2.Remarks = $"娴嬮噺鍚堟牸鐘舵��:{logMiddle.St3_Means_OK},绉伴噸鐘舵��:{logMiddle.St4_Weight_OK}";
}
else if (logMiddle.WorkingProcedure.Equals("OP30"))
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
index 16f2ef7..1e6d66c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
@@ -36,6 +36,17 @@
QualityStateEnum setQualityState = QualityStateEnum.OK;
QualityNoOkEnum? qualityNoOkEnum = null;
+
+ if (logMiddle.St3_Means_OK == false)
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80娴嬮噺涓嶅悎鏍�;
+ setQualityState = QualityStateEnum.NG;
+ }
+ else if (logMiddle.St4_Weight_OK == false)
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80绉伴噸涓嶅悎鏍�;
+ setQualityState = QualityStateEnum.NG;
+ }
//鍘绘帀杩欎釜楠岃瘉,涓轰簡璁╂満搴婅鏁板拰鏁版嵁閲囬泦璁℃暟鐩稿悓 銆怑dityby shaocx,2024-09-04銆�
/*
if (logMiddle.St5_Mark_OK == false)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index ff12fce..4bbc8c8 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -121,6 +121,8 @@
OP80鎵撴爣涓嶅悎鏍� = 30,
OP80鎵撴爣璇嗗埆涓嶅悎鏍� = 31,
+ OP80绉伴噸涓嶅悎鏍� = 32,
+ OP80娴嬮噺涓嶅悎鏍� = 33,
}
--
Gitblit v1.9.3