From 1e02ddcd520c15fbcb11cc060dd3d00e183a6ce8 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 31 8月 2024 14:49:11 +0800
Subject: [PATCH] 定时删除表数据成功

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
index 5b55b9c..d4ed380 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
@@ -14,6 +14,56 @@
     /// </summary>
     public class QualityStateHelper
     {
+
+        /// <summary>
+        /// 閲嶇疆涓嶅悎鏍煎師鍥狅紝褰撴柊寤哄伐搴忔椂
+        /// </summary>
+        /// <param name="new_process"></param>
+        public static void ResetQualityNoOkForNewProcess(ref WorkPieceProcess new_process)
+        {
+            new_process.QualityNoOk = null;
+            new_process.QualityNoOkReason = "";
+        }
+
+        /// <summary>
+        /// OP80涓撻棬鑾峰彇鏌愪簺鐐逛綅锛岄厤缃川閲忕姸鎬�
+        /// </summary>
+        /// <param name="logMiddle"></param>
+        /// <param name="info"></param>
+        /// <param name="pro"></param>
+        public static void SetQualityStateForOP80(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo info, ref WorkPieceProcess pro)
+        {
+            QualityState setQualityState = QualityState.OK;
+            QualityNoOkEnum? qualityNoOkEnum = null;
+            if (logMiddle.St5_Mark_OK == false)
+            {
+                qualityNoOkEnum = QualityNoOkEnum.OP80鎵撴爣涓嶅悎鏍�;
+                setQualityState = QualityState.NG;
+            }
+            else if (logMiddle.ST6_Camera_OK == false)
+            {
+                qualityNoOkEnum = QualityNoOkEnum.OP80鎵撴爣璇嗗埆涓嶅悎鏍�;
+                setQualityState = QualityState.NG;
+            }
+
+            info.QualityState = (int)setQualityState;
+            if (qualityNoOkEnum != null)
+            {
+                info.QualityNoOk = (int)qualityNoOkEnum;
+                info.QualityNoOkReason = qualityNoOkEnum.ToString();
+            }
+
+
+            pro.QualityState = (int)setQualityState;
+            if (qualityNoOkEnum != null)
+            {
+                pro.QualityNoOk = (int)qualityNoOkEnum;
+                pro.QualityNoOkReason = qualityNoOkEnum.ToString();
+            }
+
+
+        }
+
         /// <summary>
         /// NOOK鎺ㄥ嚭鏃讹紝鏇存柊璐ㄩ噺鐘舵�� 銆怑ditby shaocx,2024-08-23銆�
         /// </summary>
@@ -23,8 +73,9 @@
         {
             try
             {
+                QualityState setQualityState = QualityState.NG;
                 QualityNoOkEnum? qualityNoOkEnum = null;
-                info.QualityState = (int)QualityState.NG;
+                info.QualityState = (int)setQualityState;
 
                 if (info.QualityNoOk == null)
                 {
@@ -38,7 +89,7 @@
 
                 if (pro != null)
                 {
-                    pro.QualityState = (int)QualityState.NG;
+                    pro.QualityState = (int)setQualityState;
 
                     if (qualityNoOkEnum != null)
                     {
@@ -49,7 +100,7 @@
 
                 if (qualityData != null)
                 {
-                    qualityData.QualityState = (int)QualityState.NG;
+                    qualityData.QualityState = (int)setQualityState;
                 }
             }
             catch (Exception ex)

--
Gitblit v1.9.3