From 1b57ab89964f191e3986921270f58eb5bf34d954 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 7月 2024 14:58:28 +0800
Subject: [PATCH] 222
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 28 +++++++++++++++++++++-------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 10 ++++++----
2 files changed, 27 insertions(+), 11 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 b153307..5d957e3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -2248,6 +2248,8 @@
public static void SetLogMiddleForQuality(ref WorkPieceLogMiddle logMiddle)
{
+ logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
QualityNoOkEnum? qualityNoOkEnum = null;
QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
@@ -2267,7 +2269,7 @@
{
QualityState qualityState = QualityState.Suspected;
if (logMiddle.WorkingProcedure == "OP60")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 WMS鑷鍒ゆ柇
decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1);
decimal _QualityOP60To2 = SystemHelper.GetDecimal(logMiddle.QualityOP60To2);
var isPass_QualityOP60To1 = false;
@@ -2306,8 +2308,8 @@
}
return qualityState;
}
- if (logMiddle.WorkingProcedure == "OP80")
- {
+ else if (logMiddle.WorkingProcedure == "OP80")
+ {//鍚堟牸/涓嶅悎鏍肩敱 OP80 鍒ゆ柇锛孮ualityState 鍜� QualityStateStr 閮藉湪璋冪敤褰撳墠鏂规硶鍓� 鍐欏叆鍊间簡
if (logMiddle.QualityState == (int)QualityState.OK)
{
qualityState = QualityState.OK;
@@ -2396,7 +2398,7 @@
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP10")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
@@ -2408,7 +2410,7 @@
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP20")
- {//鍚堟牸/涓嶅悎鏍� 鏄牴鎹甈LC鍒ゆ柇鐨�
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
@@ -2419,8 +2421,20 @@
}
return qualityState;
}
+ else if (logMiddle.WorkingProcedure == "OP30")
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
+ if (logMiddle.QualityStateStr.Equals("OK"))
+ {
+ qualityState = QualityState.OK;
+ }
+ else
+ {
+ qualityState = QualityState.NG;
+ }
+ return qualityState;
+ }
else if (logMiddle.WorkingProcedure == "OP35")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
@@ -2432,7 +2446,7 @@
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP40")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 5c7ff34..95bd42e 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -306,11 +306,11 @@
logMiddle.QualityOP30To1 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//娑ㄦ柇鍔涚煩
break;
case "OP3002CH4":
- logMiddle = GetCH4Info(files[0].FullName, logMiddle);
+ logMiddle = GetCH4InfoForOP30(files[0].FullName, logMiddle);
logMiddle.OP30QualityFilePathCH4 = files[0].FullName;
break;
case "OP3002CH5":
- logMiddle = GetCH5Info(files[0].FullName, logMiddle);
+ logMiddle = GetCH5InfoForOP30(files[0].FullName, logMiddle);
logMiddle.OP30QualityFilePathCH5 = files[0].FullName;
break;
case "OP3002CH6":
@@ -330,10 +330,12 @@
if (logMiddle.OP35OK)
{
logMiddle.QualityStateStr = "OK";
+ logMiddle.QualityState = (int)QualityState.OK;
}
else
{
logMiddle.QualityStateStr = "NG";
+ logMiddle.QualityState = (int)QualityState.NG;
}
}
else if (WorkingProcedure.Equals("OP60"))
@@ -710,7 +712,7 @@
}
}
- public WorkPieceLogMiddle GetCH4Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH4InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
@@ -774,7 +776,7 @@
}
- public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH5InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
--
Gitblit v1.9.3