From 1cdca2ba97c3d77ec08306cfe7efceb17ddc56cf Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 7月 2024 09:39:03 +0800
Subject: [PATCH] 特殊处理OP70，因为OP70没有测量，默认合格 [Editby shaocx,2024-07-03]
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 55d645a..ebfcda2 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -226,7 +226,14 @@
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
process.StartTime = DateTimeHelper.GetDateTime();
+
process.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;
+
+ if (process.WorkingProcedureCurrent == WorkingProcedureForHMI.OP70.ToString())
+ { //鐗规畩澶勭悊OP70锛屽洜涓篛P70娌℃湁娴嬮噺锛岄粯璁ゅ悎鏍� [Editby shaocx,2024-07-03]
+ process.QualityState = (int)QualityState.OK;
+ }
+
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = loginfo.MonitoringPoint;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
@@ -2234,11 +2241,29 @@
return loginfo;
}
+ /// <summary>
+ /// 璁剧疆涓棿鍙橀噺鐨勮川閲忔暟鎹�
+ /// </summary>
+ /// <param name="logMiddle"></param>
+ public static void SetLogMiddleForQuality(ref WorkPieceLogMiddle logMiddle)
+ {
+
+ //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
+ QualityNoOkEnum? qualityNoOkEnum = null;
+ QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
+ logMiddle.QualityState = (int)qualityState;
+ logMiddle.QualityStateStr = qualityState.ToString();
+ if (qualityNoOkEnum != null)
+ {
+ logMiddle.QualityNoOk = (int)qualityNoOkEnum;
+ logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString();
+ }
+ }
/// <summary>
/// 璁＄畻OP 璐ㄩ噺鏁版嵁鏄惁鍚堟牸
/// </summary>
- public static QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
+ private static QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
{
QualityState qualityState = QualityState.Suspected;
if (logMiddle.WorkingProcedure == "OP60")
--
Gitblit v1.9.3