From 68a5f2b163aa0b5c85327d2f01926a5db24166ad Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 7月 2024 11:39:37 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 18 +++++++++++++++++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 11 +++++++++--
2 files changed, 26 insertions(+), 3 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 058cdcd..b153307 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -2401,13 +2401,21 @@
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP20")
- {
+ {//鍚堟牸/涓嶅悎鏍� 鏄牴鎹甈LC鍒ゆ柇鐨�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
+ }
+ else
+ {
+ qualityState = QualityState.OK;
}
return qualityState;
}
@@ -2417,6 +2425,10 @@
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP40")
@@ -2425,6 +2437,10 @@
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
return qualityState;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
index 0b02ff0..4c93d23 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -251,13 +251,20 @@
/// </summary>
public string QualityOP60To2 { get; set; }
-
+ /// <summary>
+ /// 娓呮礂娓╁害
+ /// </summary>
public string QualityOP70To1 { get; set; }
+ /// <summary>
+ /// 娓呮礂鍘嬪姏
+ /// </summary>
public string QualityOP70To2 { get; set; }
-
+ /// <summary>
+ /// 鍑哄彛澶勫伐浠舵俯搴�
+ /// </summary>
public string QualityOP70To3 { get; set; }
/// <summary>
--
Gitblit v1.9.3