From 97eb1b2a4f11ce60fda7a47ac1edfa588faf22eb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 14:28:41 +0800
Subject: [PATCH] //单独处理 质量数据的状态
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 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 f6198cc..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,17 +14,68 @@
/// </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>
/// <param name="value"></param>
/// <returns></returns>
- public static void SetQualityStateForNoOk(ref WorkPieceInfo info, ref WorkPieceProcess pro)
+ public static void SetQualityStateForNoOk(ref WorkPieceInfo info, ref WorkPieceProcess pro, ref QualityDataInfo qualityData)
{
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)
{
@@ -46,6 +97,11 @@
info.QualityNoOkReason = qualityNoOkEnum.ToString();
}
}
+
+ if (qualityData != null)
+ {
+ qualityData.QualityState = (int)setQualityState;
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3