From 1a39670affcd0390ad20891e353d7d2d94e644d3 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 26 6月 2024 11:59:07 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs | 5 ++++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 8 ++++----
2 files changed, 8 insertions(+), 5 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 5f6a644..5ccf128 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -2283,7 +2283,7 @@
}
else if (logMiddle.WorkingProcedure == "OP10")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
}
@@ -2291,7 +2291,7 @@
}
else if (logMiddle.WorkingProcedure == "OP20")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
}
@@ -2299,7 +2299,7 @@
}
else if (logMiddle.WorkingProcedure == "OP35")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
}
@@ -2307,7 +2307,7 @@
}
else if (logMiddle.WorkingProcedure == "OP40")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
index b8319e0..4fbb932 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
@@ -79,8 +79,11 @@
WorkingProcedure = "OP30",
WorkPieceID = "DZ045L2406240103521TAS",
UpdatedTime = DateTime.Now,
+ QualityState = (int)QualityState.NG,
+ QualityNoOk=(int)QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�,
+ QualityNoOkReason= QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�.ToString(),
MonitoringPoint = "",
- QualityStateStr="OK"
+ QualityStateStr="NG"
}
;
string WorkingProcedure = logMiddle.WorkingProcedure;
--
Gitblit v1.9.3