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_BusinessLogical/Utils/QualityStateHelper.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
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 d4ed380..1e6d66c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
@@ -33,8 +33,22 @@
/// <param name="pro"></param>
public static void SetQualityStateForOP80(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo info, ref WorkPieceProcess pro)
{
- QualityState setQualityState = QualityState.OK;
+ 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)
{
qualityNoOkEnum = QualityNoOkEnum.OP80鎵撴爣涓嶅悎鏍�;
@@ -45,6 +59,7 @@
qualityNoOkEnum = QualityNoOkEnum.OP80鎵撴爣璇嗗埆涓嶅悎鏍�;
setQualityState = QualityState.NG;
}
+ //*/
info.QualityState = (int)setQualityState;
if (qualityNoOkEnum != null)
@@ -73,7 +88,7 @@
{
try
{
- QualityState setQualityState = QualityState.NG;
+ QualityStateEnum setQualityState = QualityStateEnum.NG;
QualityNoOkEnum? qualityNoOkEnum = null;
info.QualityState = (int)setQualityState;
@@ -140,7 +155,7 @@
}
else if (logMiddle.WorkingProcedureCurrent == "OP35")
{
- qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
+ qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涜秴宸�;
return;
}
else if (logMiddle.WorkingProcedureCurrent == "OP40")
--
Gitblit v1.9.3