From 09a12e1094e90fe83c5578de64b56e9237c60507 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:13:33 +0800
Subject: [PATCH] 代码回归
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 9d29ba7..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,9 +33,20 @@
/// <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)
@@ -77,7 +88,7 @@
{
try
{
- QualityState setQualityState = QualityState.NG;
+ QualityStateEnum setQualityState = QualityStateEnum.NG;
QualityNoOkEnum? qualityNoOkEnum = null;
info.QualityState = (int)setQualityState;
--
Gitblit v1.9.3