From 6ac8c5f5a01cbe69a1a56333161d75349f139fbb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 26 6月 2024 11:15:25 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 85 +-----------------------------------------
1 files changed, 2 insertions(+), 83 deletions(-)
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 62e4b40..62b9489 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
@@ -610,7 +610,7 @@
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
QualityNoOkEnum? qualityNoOkEnum = null;
- QualityState qualityState = CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
+ QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
logMiddle.QualityState = (int)qualityState;
if (qualityNoOkEnum != null)
{
@@ -874,87 +874,6 @@
}
- /// <summary>
- /// 璁＄畻OP 璐ㄩ噺鏁版嵁鏄惁鍚堟牸
- /// </summary>
- public QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
- {
- QualityState qualityState = QualityState.Suspected;
- if (logMiddle.WorkingProcedure == "OP60")
- {
- decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1);
- decimal _QualityOP60To2 = SystemHelper.GetDecimal(logMiddle.QualityOP60To2);
- var isPass_QualityOP60To1 = false;
- var isPass_QualityOP60To2 = false;
-
-
- if (_QualityOP60To1 >= (decimal)53.018 && _QualityOP60To1 <= (decimal)53.030)
- {
- isPass_QualityOP60To1 = true;
- }
- else
- {
- qualityNoOkEnum = QualityNoOkEnum.OP60澶уご瀛旂洿寰勮秴宸�;
- }
- if (_QualityOP60To2 >= (decimal)22.005 && _QualityOP60To2 <= (decimal)22.011)
- {
- isPass_QualityOP60To2 = true;
- }
- else
- {
- qualityNoOkEnum = QualityNoOkEnum.OP60灏忓ご瀛旂洿寰勮秴宸�;
- }
-
- if (isPass_QualityOP60To1 && isPass_QualityOP60To2)
- {
- qualityState = QualityState.OK;
- }
- else
- {
- qualityState = QualityState.NG;
- }
- if (_QualityOP60To1 == 0 || _QualityOP60To2 == 0)
- {
- qualityState = QualityState.Suspected;
- return qualityState;
- }
- return qualityState;
- }
- else if (logMiddle.WorkingProcedure == "OP10")
- {
- if (logMiddle.QualityState != (int)QualityState.OK)
- {
- qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
- }
- return qualityState;
- }
- else if (logMiddle.WorkingProcedure == "OP20")
- {
- if (logMiddle.QualityState != (int)QualityState.OK)
- {
- qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
- }
- return qualityState;
- }
- else if (logMiddle.WorkingProcedure == "OP35")
- {
- if (logMiddle.QualityState != (int)QualityState.OK)
- {
- qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
- }
- return qualityState;
- }
- else if (logMiddle.WorkingProcedure == "OP40")
- {
- if (logMiddle.QualityState != (int)QualityState.OK)
- {
- qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
- }
- return qualityState;
- }
- return qualityState;
- }
-
-
+
}
}
--
Gitblit v1.9.3