From bbd4b2fdae6667540a0ec71ad5bfabc643ac1b6c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 7月 2024 09:07:48 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 127 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 4 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 eaae713..55d645a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -625,21 +625,57 @@
qualityData.OP30QualityFilePathCH3 = logMiddle.OP30QualityFilePathCH3;
qualityData.OP30QualityStateCH3 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH3 = DateTimeHelper.GetDateTime();
+
+ if (qualityData.OP30QualityStateCH3 == ((int)QualityState.NG).ToString())
+ {
+ logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�;
+ logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�.ToString();
+ //璧嬪�间笉鍚堟牸鍘熷洜
+ SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
+ }
+
break;
case "OP3002CH4":
qualityData.OP30QualityFilePathCH4 = logMiddle.OP30QualityFilePathCH4;
qualityData.OP30QualityStateCH4 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH4 = DateTimeHelper.GetDateTime();
+
+ if (qualityData.OP30QualityStateCH4 == ((int)QualityState.NG).ToString())
+ {
+ logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30棰勬嫥绱у伐浣嶅姏鐭╁ぇ;
+ logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30棰勬嫥绱у伐浣嶅姏鐭╁ぇ.ToString();
+ //璧嬪�间笉鍚堟牸鍘熷洜
+ SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
+ }
+
break;
case "OP3002CH5":
qualityData.OP30QualityFilePathCH5 = logMiddle.OP30QualityFilePathCH5;
qualityData.OP30QualityStateCH5 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH5 = DateTimeHelper.GetDateTime();
+
+ if (qualityData.OP30QualityStateCH5 == ((int)QualityState.NG).ToString())
+ {
+ logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30缁堟嫥绱у伐浣嶅姏鐭╁ぇ;
+ logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30缁堟嫥绱у伐浣嶅姏鐭╁ぇ.ToString();
+ //璧嬪�间笉鍚堟牸鍘熷洜
+ SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
+ }
+
break;
case "OP3002CH6":
qualityData.OP30QualityFilePathCH6 = logMiddle.OP30QualityFilePathCH6;
qualityData.OP30QualityStateCH6 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH6 = DateTimeHelper.GetDateTime();
+
+ if (qualityData.OP30QualityStateCH6 == ((int)QualityState.NG).ToString())
+ {
+ logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30鍘嬭‖濂楀伐浣嶅姏鐭╁ぇ;
+ logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30鍘嬭‖濂楀伐浣嶅姏鐭╁ぇ.ToString();
+ //璧嬪�间笉鍚堟牸鍘熷洜
+ SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
+ }
+
break;
default:
break;
@@ -2245,9 +2281,92 @@
}
return qualityState;
}
+ if (logMiddle.WorkingProcedure == "OP80")
+ {
+ decimal _QualityOP80_D_TKZJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_D_TKZJ);
+ if (!(_QualityOP80_D_TKZJ >= (decimal)53.018 && _QualityOP80_D_TKZJ <= (decimal)53.03))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80澶уご瀛旂洿寰勮秴宸�;
+ }
+
+ decimal _QualityOP80_X_TKZJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_X_TKZJ);
+ if (!(_QualityOP80_X_TKZJ >= (decimal)22.005 && _QualityOP80_X_TKZJ <= (decimal)22.011))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛旂洿寰勮秴宸�;
+ }
+
+ decimal _QualityOP80_ZXJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_ZXJ);
+ if (!(_QualityOP80_ZXJ >= (decimal)144.475 && _QualityOP80_ZXJ <= (decimal)144.525))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80涓績璺濊秴宸�;
+ }
+
+ decimal _QualityOP80_DTKYZD = SystemHelper.GetDecimal(logMiddle.QualityOP80_DTKYZD);
+ if (!(_QualityOP80_DTKYZD >= (decimal)0 && _QualityOP80_DTKYZD <= (decimal)0.005))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80澶уご瀛斿渾鏌卞害瓒呭樊;
+ }
+
+ decimal _QualityOP80_XTSMYD = SystemHelper.GetDecimal(logMiddle.QualityOP80_XTSMYD);
+ if (!(_QualityOP80_XTSMYD >= (decimal)0 && _QualityOP80_XTSMYD <= (decimal)0.003))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿渾搴︿笂闈㈣秴宸�;
+ }
+
+ decimal _QualityOP80_XTXMYD = SystemHelper.GetDecimal(logMiddle.QualityOP80_XTXMYD);
+ if (!(_QualityOP80_XTXMYD >= (decimal)0 && _QualityOP80_XTXMYD <= (decimal)0.003))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿渾搴︿笅闈㈣秴宸�;
+ }
+
+ decimal _QualityOP80To4 = SystemHelper.GetDecimal(logMiddle.QualityOP80To4);
+ if (!(_QualityOP80To4 >= (decimal)0 && _QualityOP80To4 <= (decimal)0.075))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿钩琛屽害寮洸瓒呭樊;
+ }
+
+ decimal _QualityOP80To5 = SystemHelper.GetDecimal(logMiddle.QualityOP80To5);
+ if (!(_QualityOP80To5 >= (decimal)0 && _QualityOP80To5 <= (decimal)0.2))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿钩琛屽害鎵洸瓒呭樊;
+ }
+
+ decimal _QualityOP80To6 = SystemHelper.GetDecimal(logMiddle.QualityOP80To6);
+ if (!(_QualityOP80To6 >= (decimal)0 && _QualityOP80To6 <= (decimal)0.04))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80澶уご瀛斿瀭鐩村害瓒呭樊;
+ }
+
+ decimal _QualityOP80To10 = SystemHelper.GetDecimal(logMiddle.QualityOP80To10);
+ if (!(_QualityOP80To10 >= (decimal)0 && _QualityOP80To10 <= (decimal)0.04))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿瀭鐩村害瓒呭樊;
+ }
+
+ decimal _QualityOP80_Houdu = SystemHelper.GetDecimal(logMiddle.QualityOP80_Houdu);
+ if (!(_QualityOP80_Houdu >= (decimal)21.80 && _QualityOP80_Houdu <= (decimal)21.85))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80鍘氬害瓒呭樊;
+ }
+
+ decimal _QualityOP80To1 = SystemHelper.GetDecimal(logMiddle.QualityOP80To1);
+ if (!(_QualityOP80To1 >= (decimal)364 && _QualityOP80To1 <= (decimal)385))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80澶уご绔噸閲忚秴宸�;
+ }
+
+ decimal _QualityOP80To2 = SystemHelper.GetDecimal(logMiddle.QualityOP80To2);
+ if (!(_QualityOP80To2 >= (decimal)143 && _QualityOP80To2 <= (decimal)155))
+ {
+ qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご绔噸閲忚秴宸�;
+ }
+
+
+ return qualityState;
+ }
else if (logMiddle.WorkingProcedure == "OP10")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
}
@@ -2255,7 +2374,7 @@
}
else if (logMiddle.WorkingProcedure == "OP20")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
}
@@ -2263,7 +2382,7 @@
}
else if (logMiddle.WorkingProcedure == "OP35")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
}
@@ -2271,7 +2390,7 @@
}
else if (logMiddle.WorkingProcedure == "OP40")
{
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
}
--
Gitblit v1.9.3